Re-updated to 1.7.2 recommended...woops.

I forgot to sync first so I had some fun merge conflicts to deal with!
Yay!