Merge branch 'master' into reduce-ci-matrix

This commit is contained in:
Kenneth Reitz 2017-05-27 13:46:18 -04:00
commit 1ee439adff