Merge pull request #913 from Romain-Geissler/fix-gcc-misleading-indentation-warning
Remove gcc 6 misleading indentations warnings