Updated version and change log to 0.2.5.
Merge branch 'release/0.2.5'