Merge branch 'master' into noitama

requirements.txt

@@ -17,7 +17,7 @@ bcrypt>=3.1,<3.2  # https://github.com/pyca/bcrypt/
 chardet>=3.0,<3.1  # https://pypi.python.org/pypi/chardet
 babel>=2.6,<2.7  # http://babel.pocoo.org/en/latest/changelog.html
 pyxdg>=0.26,<0.27  # https://freedesktop.org/wiki/Software/pyxdg/
-Jinja2>=2.10,<2.11  # http://jinja.pocoo.org/docs/latest/changelog/
+Jinja2>=2.10,<3.1.0  # http://jinja.pocoo.org/docs/latest/changelog/
 
 # See https://github.com/pallets/markupsafe/issues/286 but breaking change in
 # MarkupSafe causes jinja to break