Merge branch 'cmakeBuild' into develop (PR #230)