Merge branch 'develop' into avoid_duplicate_filters

CHANGES.rst

README.rst

UPGRADE.rst

scripts/synapse_port_db

synapse/__init__.py

synapse/api/auth.py

synapse/app/federation_sender.py

synapse/app/homeserver.py

synapse/app/user_dir.py

synapse/appservice/__init__.py

synapse/config/server.py

synapse/federation/transaction_queue.py

synapse/handlers/federation.py

synapse/handlers/message.py

synapse/handlers/presence.py

synapse/handlers/room.py

synapse/handlers/room_member.py

synapse/handlers/sync.py

synapse/handlers/typing.py

synapse/handlers/user_directory.py