Merge pull request #131 from olerem/gcc-2017.06.25