branch 1.7.2 is officially merged into master