PBI-10 Approval: epiphany 3.6.1 (josh)