Merge branch 'release/0.2.6' into develop
Merge branch 'master' into develop