r1310 + fixed a regexp for long VLAN names