Imported Upstream version 0.9.36
Merge tag 'upstream/0.9.36'

Upstream version 0.9.36