Merge changes up to and including release 1.1.0