Changelog format fix
Merge branch '1.7'