Bug 827604 - Pseudoclass lock isn't clearing; r=dcamp
Bug 644413 - Add support for -sp-context mode-line in Scratchpad. r=harth
merge m-c to fx-team