Merge branch 'master' into pulp-2.4

Conflicts:
	run-tests.py