bump version
Merge branch 'master' into channel

* master:
  bump version