Add more stubs to, fixed

Merged Bitbucket Importer requested to merge bitbucket/merged-pr-658 into branch/py3.6

Created originally on Bitbucket by Ram Rachum

Was already merged in Bitbucket before import, marked as merged by the import user

@arigo Sorry, I couldn’t figure out how to update a pull request, I’m not used to hg. This is the updated pull request.

Merge request reports