Imported Upstream version 2.5.5
Merge tag 'upstream/2.5.5'

Upstream version 2.5.5