setup: Test kernel to check out right branch
Merge remote-tracking branch 'origin/master' into mac