Tidy things up
Merge branch 'master' into dma

Conflicts:
	sxs.c