Merge branch 'slaprunner_newcloud9' into slaprunner
Cédric de Saint Martin authored
Conflicts:
	software/slaprunner/software.cfg
6f92c092