2.5 bump, again?
Merge branch 'cmake'
BUMP