white space changes only
Merge branch 'master' into start-reset

Conflicts:
	src/atmel.c
	src/atmel.h
	src/commands.c