Bug 881633 - Style Editor should remember last selected stylesheet and line when page is reloaded; r=paul
Bug 882986 - A source map's sourcesContent doesn't work when the original file path is absolute; r=dcamp
Merge mozilla-central and fx-team
Bug 879406 - Unbust |mach help| when arguments are not prefixed with '-'; r=ted

DONTBUILD (NPOTB)
Merge birch to m-c.