Merge branch 'master' into master

This commit is contained in:
Kenneth Reitz 2017-05-25 14:22:53 -07:00 committed by GitHub
commit d911c897ee
67 changed files with 3585 additions and 2201 deletions

File diff suppressed because it is too large Load diff