Imported Upstream version 1.2.0
Merge tag 'upstream/1.2.0'

Upstream version 1.2.0

* tag 'upstream/1.2.0':
  Imported Upstream version 1.2.0