Imported Upstream version 1.0+hg560
Merge tag 'upstream/1.0+hg560'

Upstream version 1.0+hg560
ok