Imported Upstream version 2.5.1089
Merge tag 'upstream/2.5.1089'

Upstream version 2.5.1089

* tag 'upstream/2.5.1089':
  Imported Upstream version 2.5.1089
New upstream release.