PBI-10 Approval: gnomekiss 2.0_7 (josh)