Updated to 1.7.10, not backwards compatible
Merge remote-tracking branch 'origin/master'