Imported Upstream version 0.9.11
Merge tag 'upstream/0.9.11'

Upstream version 0.9.11