Updated to 1.7.2
Merge origin/master