Also adds support for GCC 4.9 and CMake 3.x. Problem with CMake 3.x noticed by landry@, fix from upstream repo via dcoppa@