Release 2.2.5
Merge branch 'master' into develop