Align with upstream#1308

jakob-keller merged 4 commits intoaio-libs:masteraio-libs/aiobotocore:masterfrom

jakob-keller:align-with-upstreamjakob-keller/aiobotocore:align-with-upstreamCopy head branch name to clipboard