Merge remote-tracking branch 'origin/develop' into paul/thirdpartylookup

jenkins-unittests.sh

synapse/app/media_repository.py

synapse/app/pusher.py

synapse/app/synchrotron.py

synapse/appservice/__init__.py

synapse/appservice/scheduler.py

synapse/handlers/__init__.py

synapse/handlers/appservice.py

synapse/handlers/auth.py

synapse/handlers/federation.py

synapse/handlers/presence.py

synapse/notifier.py

synapse/push/action_generator.py

synapse/push/baserules.py

synapse/push/pusherpool.py

synapse/replication/resource.py

synapse/replication/slave/storage/_base.py

synapse/replication/slave/storage/directory.py

synapse/replication/slave/storage/registration.py

synapse/rest/client/v1/admin.py