Fix macro expansion
Merge remote-tracking branch 'upstream/master' into travis-osx