Merge 1.7.2 into master

This brings master up to date with 1.7.2.  Mostly it consists of fake merges (strategy=ours); the only file that appeared to be missing changes in master was CHANGELOG.