Update to 1.7.10+
Merge remote-tracking branch 'origin/master'