CMake 3.1.0
Merge branch 'release'