Fix merge
docstring fix
Merge pull request #2421 from megies/patch-2

Docstring fix
Merge remote-tracking branch 'upstream/v1.3.x'
Fix some six.moves