Merge into master in preparation for 1.1.1.