Release 2.5
Start development series 2.5-post
Merge branch 'b2.5'