Merge pull request #7531 from dtmoodie:cmake_updates
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 22 Oct 2016 16:13:11 +0000 (16:13 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 22 Oct 2016 16:13:11 +0000 (16:13 +0000)

Trivial merge