Fix a loc issue with for-NSRange loops
Merge branch 'master' into legacy_macros