Version bump to 1.1.2
Merge remote-tracking branch 'upstream/master'