Update for 1.7, bump version accordingly