Updated for 1.7.2

I would recommend copying the master branch to a new 1.6 branch and merging this to master.