Bug 991427 - Check if the last character of the string is part of a surrogate pair when truncating text for display in the context menu, to avoid splitting surrogate pairs, r=gavin
Bug 1026561 - The New Tab Page should be smarter about showing more tiles when on large screens [r=adw]
Bump up default columns to fit most Firefox users including 2560px wide resolutions.
Bug 990322 - Don't show multiple thumbnails from the same base domain. r=adw
Bug 1054166: Mirror Add/RemoveListener in Add/RemoveDirectListener r=roc
Bug 874437 - Only enable ipc sync wait deferred Windows message handling for plugin protocols, everything else should use standard blocking waits. r=bsmedberg
Merge fx-team to m-c. a=merge
Bug 874437 - Increase B2G mochitest leak threshold to 5012 bytes. rs=khuey
Merge inbound to m-c. a=merge