Merge proposals

Auto-NDISwrapper has no merge proposals.