Add scope specification for globals
Merge commit '4496f31cce56eab880a9546ce4c6c90fb586e386'
Merge branch 'master' into stackhammer-reidmv-master