Mir

Comment 12 for bug 1584784

fix is wip, still testing... hope to get it out the door Tuesday (Monday is US holiday)