Merge branch 'gso_encap_fixes'