Re-merge cmake branch to 1.8.14 - mistakenly merged with 1.8 branch.