Imported Upstream version 3.5.25
Merge tag 'upstream/3.5.25'

Upstream version 3.5.25
Update packaging for 3.5.25