merge in upstream ifupdown changes