Merge branch 'erikj/context_api' into erikj/search

CHANGES.rst

synapse/__init__.py

synapse/api/auth.py

synapse/api/errors.py

synapse/api/filtering.py

synapse/config/cas.py

synapse/config/homeserver.py

synapse/config/password.py

synapse/config/saml2.py

synapse/handlers/__init__.py

synapse/handlers/receipts.py

synapse/handlers/room.py

synapse/rest/client/v1/login.py

synapse/rest/client/v1/room.py

synapse/storage/stream.py

synapse/types.py

tests/test_types.py