Pull in upstream changes to Specta - now at 1.7