Merge in all the changes from 1.7.5