Don't mix changelog for 1.7.1 and 1.7.2
Merge branch '1.7-stable'