Applying patch moz-formatting @fabi1cazenave