Mats, you'll want the changes in my patch in attachment 9037091 [details] [diff] [review] (bug 1520598 comment 6) when relanding. (feel free to just merge that in with your main patch here; it's a trivial bonus change)
Bug 1520236 Comment 7 Edit History
Note: The actual edited comment in the bug view page will always show the original commenter’s name and original timestamp.
Mats, you'll want the changes in bug 1520598 comment 6 when relanding. (direct link to that patch: attachment 9037091 [details] [diff] [review]) (feel free to just merge that in with your main patch here; it's a trivial bonus change)