CMake 3.1.0-rc1
Merge branch 'revert-definition-map-lookup' into release