PBI-10 Approval: xbill 2.1_7 (josh)