Imported Upstream version 0.3.1
Imported Upstream version 0.3.1
Imported Upstream version 0.3.1
Imported Upstream version 0.3.1
Imported Upstream version 0.4.0
Merge tag 'upstream/0.4.0'

Upstream version 0.4.0