Changes

* [https://bugzilla.mozilla.org/show_bug.cgi?id=708814 Bug 708814]

** Up for first review

** Spawned bug [https://bugzilla.mozilla.org/show_bug.cgi?id=708553 708553]

* [https://bugzilla.mozilla.org/show_bug.cgi?id=680321 Bug 680321]

** Initial implementation done, up for feedback, no tests