Merge branch 'sg/travis-gcc-4.8'