remove trailing whitespaces
Merge branch 'master' into changeargs

Conflicts:
	src/commands.c