Imported Upstream version 0.6.2
Merge tag 'upstream/0.6.2'

Upstream version 0.6.2