Marge
Merge branch 'master' of http://github.com/yandld/CH-K-Lib-V2.5

Conflicts:
	Libraries/drivers/K/inc/flexbus.h