Merge branch 'devel' of ssh://git.fedorahosted.org/git/FedoraReview into merge-devel

Conflicts:
	test/run-tests