Merge branch 'sja110-vlan-fixes'