Merge pull request #495 from nicolas-raoul/fix-for-issue2907-with-no-formatting-changes