Merge branch 'master' into FindGTest-revert-no-release