PBI-10 Approval: graveman 0.3.12.5_10 (josh)