fix macro parameter handling
fix #478
release id 2d709af1e0
Merge remote-tracking branch 'origin/master' into 1.4.6