Merge branch 'master' into stable
Bump VERSION to 3.4.0.
Bump VERSION to 4.0.0.alpha.