Merge branch 'master' into msoos-no-const-as-macro-2