Overwrite master with 1.7.10 changes.  Will handle master branch with more care in the future.