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