Bug 1038725 - Making exception messages printing the correct variables. r=dhylands
Merge branch 'master' into WIP