Reindented
Updated change log
Merge branch 'release-1.7.4'