Bug 1069043 - TypeError: redeclaration of variable mode
Merge pull request #1626 from erikvold/1069043

Bug 1069043 - TypeError: redeclaration of variable mode r=@jsantell