Imported Upstream version 2.5.2
Merge tag 'upstream/2.5.2'

Upstream version 2.5.2