Imported Upstream version 0.9.13
Merge tag 'upstream/0.9.13'

Upstream version 0.9.13