Merge branch 'refs/heads/Testing' into jb-4.2.2

Conflicts:
	Makefile
	arch/arm/configs/semaphore_captivate_defconfig
	sbuild.sh