[bmx6] update to master-tip 8b0585e
Merge branch 'master' into bmx6_testing

Conflicts:
	bmx6/Makefile, 	keeping [bmx6] update to master-tip 8b0585e from 20140523