Add test for issue #872
Fix #872 (macro expansion in multiple blocks)
Merge pull request #873 from gmarkall/fix_macro_expansion

Fix macro expansion (issue #872)