Bug 1093507 - Fix for permaorange, with comments addressed;r=gijskruitbosch