PBI-10 Approval: goonies 1.0.1_8 (josh)