AFIO remap corrected
Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/stm32/f3/Makefile
Merge branch 'master' of github.com:molnarkares/libopencm3

Conflicts:
	lib/stm32/f3/Makefile