Imported Upstream version 0.3.4
Merge tag 'upstream/0.3.4'

Upstream version 0.3.4
Imported Upstream version 0.3.4
Imported Upstream version 0.3.4
Merge tag 'upstream/0.3.4'

Upstream version 0.3.4
Pulled in upstream 0.3.4