CMake 3.1.0
Merge branch 'release' into test-release
Merge topic 'test-release' into next

807ca28e Merge branch 'release' into test-release
30eda284 CMake 3.1.0