Imported Upstream version 0.9.14c
Merge tag 'upstream/0.9.14c'

Upstream version 0.9.14c