Merge branch 'develop'

* develop:
  Build 0.26.0