PBI-10 Approval: wammu 0.36_6 (josh)