Merge branch 'bridge_vlan_fixes'