Updated to 1.7, the last of the version 1 branch