Release 2.5.0
Merge branch 'master' into develop