bump to 1.1.0-SNAPSHOT
Merge remote-tracking branch 'upstream/master'