Done https://bugzilla.mozilla.org/show_bug.cgi?id=1013967
I guess this is good to merge then