Fix wrong processing of '->' for objects
Merge branch 'master' into legacy_macros