Imported Upstream version 1.0.1
Merge tag 'upstream/1.0.1'

Upstream version 1.0.1