Branch 1.7 Merge

Pulling the changes from 1.7.2 (stable) into 1.6.

Here we go!