Merge remote-tracking branch 'upstream/master' into maxb/fixing-merge

Conflicts:
	README.rst
	broker/l2tp_broker.py
	broker/requirements.txt
Merge branch 'maxb/fixing-merge'

Conflicts:
	broker/l2tp_broker.py