Merge branch 'setlocalversion-speedup' into kbuild/kbuild