3.4 release

Pushing issue 458 into master