Merge branch 'master' into ci-msvc-14.29-16.10