Merge branch 'gc_mods_pull' into 1.5-development
Merge branch '1.5-development' into cmake-reorg