Merge upstream fixes from 1.1.1