Imported Upstream version 0.9.12
Merge tag 'upstream/0.9.12'

Upstream version 0.9.12