TODO Updated.
Version bump.
Merge branch 'release/0.2.6' into develop