Imported Upstream version 3.4
Merge tag 'upstream/3.4' into v3.4

Upstream version 3.4
Update changelog for 3.4-1 release