Imported Upstream version 0.14.1
Merge tag 'upstream/0.14.1'

Upstream version 0.14.1