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

* upstream/master: