Merge change 21812 into eclair

* changes:
  Allow parenthesized expressions as the value of defines