Merging master > dev-1.7.10

Contains the actual 1.7.10 update from Parker