Imported Upstream version 5.5.36
Imported Upstream version 5.5.36
Merge tag 'upstream/5.5.36'

Upstream version 5.5.36