Changes 0.2.6
Merge remote-tracking branch 'origin/release-0.2.6' into develop