Imported Upstream version 0.9.14
Merge tag 'upstream/0.9.14'

Upstream version 0.9.14