Bump version
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Bump version