PBI-10 Approval: foobillard 3.0a_7 (josh)