Merge branch 'develop' into matthew/preview_urls

AUTHORS.rst

CHANGES.rst

setup.cfg

synapse/__init__.py

synapse/config/homeserver.py

synapse/config/jwt.py

synapse/events/__init__.py

synapse/handlers/__init__.py

synapse/handlers/_base.py

synapse/handlers/auth.py

synapse/handlers/federation.py

synapse/handlers/message.py

synapse/handlers/room.py

synapse/handlers/room_member.py

synapse/handlers/sync.py

synapse/http/servlet.py

synapse/notifier.py

synapse/push/baserules.py

synapse/push/push_rule_evaluator.py

synapse/python_dependencies.py