bug 971662 - part 0 - The BoxModelHighlighter has options for drawing regions and guides; r=miker
Bug 977774 - Count the number of times a user opts out of Instant Translation. r=felipe.
Bug 973294 - Count the number of times 'Show Original' is used. r=felipe.
Bug 1029363 - browser_translation_fhr.js fails if it runs on its own. r=ttaubert.
Bug 1023484 - Improvements and test for the initial requestAutocomplete stub. r=MattN

--HG--
rename : toolkit/components/formautofill/AutofillController.js => toolkit/components/formautofill/FormAutofillContentService.js
rename : toolkit/components/formautofill/nsIAutofillController.idl => toolkit/components/formautofill/nsIFormAutofillContentService.idl
Don't fail test_dbgsocket.js in case the socket connections time out (bug 931315); r=me

--HG--
extra : rebase_source : 4a5f043d5b324e31d7b571ec1db2d17bf7446381
Bug 1029486 - Check for dead wrappers after running language detection r=felipe
Bug 1028575 - Remove brandShortName from Preferences tab title. r=jaws
Bug 1017156 - about:preferences briefly shows as the tab title when opening the in-content preferences. r=dao
Bug 1017156 - Fix tests for blank tab name now expected in TabOpen event. r=dao
Bug 977770 - Count the times users manually adjust the offered translation pair. r=felipe.
Backed out changeset e34a47ba8c1a (bug 971662) for highlighter.js:783 - NS_ERROR_NOT_AVAILABLE exceptions during the test run
Bug 883609 - Making OS.File.removeDir work without options;r=froydnj
Bug 883609 - Make Session Restore backups useful;r=ttaubert
Bug 883609 - Porting tests to new Session Restore backup mechanism;r=ttaubert

--HG--
rename : browser/components/sessionstore/test/browser_833286_atomic_backup.js => browser/components/sessionstore/test/browser_backup_recovery.js
Bug 1000514, r=dao

--HG--
extra : rebase_source : ae7d5335d873814eb73fbc52d299cc93ba892a4f
Merge mozilla-central and fx-team
Bug 994729 - Make box model guides move on layout view region hover r=bgrins
Bug 1029207 - Uplift Add-on SDK to Firefox r=me
Bug 1022061 - Downloading files with leading period removes file on disk but doesn't replace it. r=paolo