Merge branch 'vlan_offloads'