Merge branch 'master' of github.com:Lumida/botocore
Merge remote-tracking branch 'upstream/master'