Merge branch 'master' into static-linking-osx