Bug 983653 - UITour: Make the highlight effect a circle on the bookmarks combo button. ui-r=shorlander, r=MattN
Bug 981258 - Set the breakpoints in browser_dbg_breakpoints-break-on-last-line-of-script-on-reload.js before executng the IIFE so that the IIFE's Debugger.Script can't be GC'd before the breakpoints are set; r=past
Bug 942270 - Refactor context menu code. r=bnicholson
Merge f-t to m-c