Merge branch 'pulls/DWT' into work

Conflicts:
	lib/stm32/l1/Makefile