Merging 1.7.7 in to master.