Merge branch 'setlocalversion-speedup' into kbuild/rc-fixes

Conflicts:
	Makefile