Bring in missing changes from 1.1 release