Imported Upstream version 2.5.0
Merge tag 'upstream/2.5.0'

Upstream version 2.5.0
Update changelog for 2.5.0 release
Refreshed patches