Merge branch 'macvtap_capture'