Merge remote-tracking branch 'sm/sm-jb-mr1' into HEAD

Conflicts:
	core/combo/TARGET_linux-arm.mk

Signed-off-by: Paul Beeler <sparksco@gmail.com>