Let each cli register itself
Merge branch 'master' into fd

Conflicts:
	bootloader/stage2/cli.c