Merge pull request #61 from dscho/some-backports-from-3.4

Merge pull request #61 from dscho/some-backports-from-3.4 #112