PBI-10 Approval: dlume 0.2.4_11 (josh)