PBI-10 Approval: zenmap 6.40_1 (josh)