Merge branch 'master' into pyup-update-wheel-0.30.0-to-0.31.0

diff --cc requirements.txt
index 996ea5a37b6946c7deaa9849064970cdf32b3e84,19a2c2e7cdce57b2de1d632460f932037359359f..989a38bb6ac8889ae37581016f0811ee862abd22
--- 1/requirements.txt
--- 2/requirements.txt
+++ b/requirements.txt
@@@ -1,6 -1,6 +1,6 @@@
  # Testing and deployment packages.
  coverage==4.4.2
- pytest==3.3.0
+ pytest==3.5.0
  pytest-cov==2.5.1
- freezegun==0.3.9
+ freezegun==0.3.10
 -wheel==0.30.0
 +wheel==0.31.0