Bump version
Merge tag 'v2.2.5'