Merge branch 'v4.7.x' to get DIFFSTAT, Changelog, etc up to date in master