Re-add bridge stuff, which was lost somehow...
Merge branch 'markj-kernel-config' into markj-develop