Typo
define macros before they are used
Merge remote-tracking branch 'upstream/master' into e6-upstream1