Fix for 2.5 release
Merge branch 'master' into cmake_support