Imported Upstream version 0.9.4
Merge tag 'upstream/0.9.4'

Upstream version 0.9.4
0.9.4