Merge branch 'vxlan-fixes'