Bug 1102494: fix backslashes; r=mrrrgn
Merge default -> production