0.2.5
0.2.5 for real.
Merge branch 'release/0.2.5' into develop