Imported Upstream version 0.9.2
Merge tag 'upstream/0.9.2'

Upstream version 0.9.2