Version 0.2.5
Merge branch 'master' into multi-wallet