Imported Upstream version 0.4.1
Merge tag 'upstream/0.4.1'

Upstream version 0.4.1