fix #1153
Merge branch '3.7'
Merge pull request #337 from jygaulier/3.7-fix1153

[3.7] Fix #1153
Remove extra comments
Merge branch '3.7'
Add CHANGELOG
Update CHANGELOG
Add release notes
Update Changelog and release notes