Bumped master to 3.4.0.
Merge pull request #5702 from cb1kenobi/master

Bumped master to 3.4.0.
Merge pull request #5705 from cb1kenobi/3_3_X

Bumped master to 3.4.0.