[sr-dev] git:master:cafabcf6: Merge pull request #1282 from oyvindkolbu/gcc-7