Cut 1.7.4
Merge branch '1.7' into 1.8
Cut 1.8.4
Formatting to match master
Merge branch '1.7' into 1.8