Bug 833941 - Do not break lines.
Merge pull request #8614 from crh0716/833941

Bug 833941 - Do not break lines. r=asuth