Changed logic a bit (ie couldn't tell you, did the changes 3 mo ago)
Merge github.com:EwanColdicott/ChibiOS

Conflicts:
	os/hal/platforms/STM32F4xx/dcmi_lld.c