Catch an unreceognized complex command.
Merge remote-tracking branch 'origin/iso' into iso

Conflicts:
	src/commands.cpp