Merge branch 'release/0.2.5' into develop
ffmerge: Only do the merge if there are commits to be merged.
Bump version to 0.2.6
Merge branch 'release/0.2.6'