Imported Upstream version 1.1.0
Merge tag 'upstream/1.1.0'

Upstream version 1.1.0