Merge 2.7.2 branch into master, ready for release