version 0.5.25
Merge branch 'master' into testing