Set VERSION to 3.4.0-dev (via xsrc)
Merge branch 'master' into 3.3.x
Set VERSION to 3.3.0 (via xsrc)