Merge branch 'develop'
Set version to 0.25.0+