Merge branch 'develop' into travis/admin-list-media

scripts/move_remote_media_to_new_store.py

synapse/api/errors.py

synapse/app/appservice.py

synapse/app/client_reader.py

synapse/app/federation_reader.py

synapse/app/federation_sender.py

synapse/app/frontend_proxy.py

synapse/app/homeserver.py

synapse/app/media_repository.py

synapse/app/pusher.py

synapse/app/synchrotron.py

synapse/app/user_dir.py

synapse/config/registration.py

synapse/config/server.py

synapse/federation/federation_client.py

synapse/federation/transaction_queue.py

synapse/federation/transport/client.py

synapse/federation/transport/server.py

synapse/handlers/device.py

synapse/handlers/e2e_keys.py