Imported Upstream version 1.0.5
Imported Upstream version 1.0.5
Imported Upstream version 1.0.5
Imported Upstream version 1.0.6
Merge tag 'upstream/1.0.6'

Upstream version 1.0.6