Update to support gcc-5-20141207