Merge branch 'master' into bump-utils-19.0.0

requirements.txt

@@ -1,25 +1,25 @@
 apispec==0.25.0
-Flask==0.10.1
-Flask-Script==2.0.5
-Flask-Migrate==2.1.0
-Flask-SQLAlchemy==2.0
-psycopg2==2.7.3
-SQLAlchemy==1.0.15
-SQLAlchemy-Utils==0.32.14
-PyJWT==1.5.2
-marshmallow==2.4.2
-marshmallow-sqlalchemy==0.13.1
-flask-marshmallow==0.6.2
-Flask-Bcrypt==0.6.2
-boto3==1.4.4
-monotonic==1.3
-statsd==3.2.1
-jsonschema==2.6.0
-gunicorn==19.7.1
-docopt==0.6.2
-six==1.10.0
-iso8601==0.1.12
+boto3==1.4.6
 celery==3.1.25 # pyup: <4
+docopt==0.6.2
+Flask-Bcrypt==0.6.2
+Flask-Marshmallow==0.8.0
+Flask-Migrate==2.1.0
+Flask-Script==2.0.5
+Flask-SQLAlchemy==2.2
+Flask==0.12.2
+gunicorn==19.7.1
+iso8601==0.1.12
+jsonschema==2.6.0
+marshmallow-sqlalchemy==0.13.1
+marshmallow==2.13.6
+monotonic==1.3
+psycopg2==2.7.3
+PyJWT==1.5.2
+six==1.10.0
+SQLAlchemy-Utils==0.32.14
+SQLAlchemy==1.1.13
+statsd==3.2.1
 
 notifications-python-client==4.3.1