Merge branch 'master' into pyup-update-pytest-2.9.2-to-3.2.2

diff --cc requirements.txt
index 12e1a23044d64a3f7387531c5df5d78eac934552,ca7236ba69e18d625fd1be736b6fd5a2fe691f05..c2dbc17076e94446cb0bc41353dd4989f8551a39
--- 1/requirements.txt
--- 2/requirements.txt
+++ b/requirements.txt
@@@ -1,6 -1,6 +1,6 @@@
  # Testing and deployment packages.
- coverage==4.1
 +pytest==3.2.2
+ coverage==4.4.1
 -pytest==2.9.2
  pytest-cov==2.4.0
- freezegun==0.3.7
+ freezegun==0.3.9
  wheel==0.29.0