Merge branch 'release/0.2.5'
Missing end
Merge branch 'hotfix/0.2.5.1' into develop