<NME> test-requirements.txt
<BEF> factory-boy>=2.4
mock==2.0.0
httmock==1.2.5
testfixtures==4.7.0
tox
psycopg2-binary>=2.7.4
mysqlclient>=1.3.3
packaging

<MSG> Merge branch 'master' into fix/1430
<DFF> @@ -1,8 +1,7 @@
 factory-boy>=2.4
-mock==2.0.0
+mock==2.0.0; python_version < '3.3'
 httmock==1.2.5
 testfixtures==4.7.0
 tox
 psycopg2-binary>=2.7.4
 mysqlclient>=1.3.3
-packaging

Merge branch 'master' into fix/1430