Fold in changes
Bump version to 0.2.6
Merge branch 'release-0.2.6' into develop