Imported Upstream version 0.5.1
Imported Upstream version 0.5.1
Imported Upstream version 0.6.1
Merge tag 'upstream/0.6.1'

Upstream version 0.6.1