Merge branch 'develop'
Sets version to 1.1.0+.