Merge 3.4.x changes into master.
Merge pull request #454 from apenney/merge-from-34

Merge 3.4.x changes into master.