Version bump
Merge branch 'hotfix/0.2.6' into develop