Merge branch 'master' into bootstrap-setup

Conflicts:
	CHANGES.rst
	setup.py
Use custom --madxdir for builds on test servers