Merge branch 'ja4-master' into work

Conflicts:
	TODO
	src/Makefile
	src/emc/motion/emcmotglb.c
	src/emc/motion/motion.c