Imported Upstream version 1.2
Merge tag 'upstream/1.2'

Upstream version 1.2