Imported Upstream version 0.3.3b
Merge tag 'upstream/0.3.3b'

Upstream version 0.3.3b
Updated upstream-commit for 0.3.3b
Updated upstream-commit for 0.3.3b