Imported Upstream version 2.5.0
Merge tag 'upstream/2.5.0'

Upstream version 2.5.0
log changes
forward-port quilt patches