Merge change 21845 into eclair

* changes:
  Allow redefinition of macros.