Update to 1.7 as of 7804bf0