Imported Upstream version 1.9
Merge tag 'upstream/1.9'

Upstream version 1.9