Merge branch 'master', remote-tracking branch 'origin/master'
fixing a build issue for different GCC