Accidental backport
Merge pull request #379 from Fuzzysqurl/patch-3

Accidental backport