work
Merge branch 'master' of github.com:casadi/testbot
fixup
Merge branch 'master' of github.com:casadi/testbot

Conflicts:
	master/master.cfg
missing ]