Imported Upstream version 1.0.0
Merge tag 'upstream/1.0.0'

Upstream version 1.0.0