Merge to master in preparation for 1.1 release.