Bump version up to 1.1.0
Merge remote-tracking branch 'origin/master' into develop