Merge branch 'master' into local
Updated syntax/formatting.
Merge branch 'local'