Bug 811403 (Part 1) - Take scrollbars into account for viewport units if 'overflow: scroll' is set. r=dbaron
Bug 811403 (Part 2) - Tests for viewport unit interactions with overflow values of scroll and auto. r=dbaron
Bug 854763 (part 2) - Include asm.js arrays the standalone "explicit" reporter, and fix some potential leaks involving asm.js array buffers on Windows.  r=luke.

--HG--
extra : rebase_source : b4011174cf1c38604e65b15b246588be83d4f312
Bug 855526 - Don't assert on busted asm.js modules with more than 3 arguments.  r=luke.

--HG--
extra : rebase_source : 3d168e2bded38f499d563f00d0dcc245aa9d1a02
Bug 856366 - Fix intermittent browser_privatebrowsing_zoomrestore.js failure and add logging to debug underlying problem. r=test
No bug - Remove duplicated code in ContactDB.jsm. r=gwagner

--HG--
extra : rebase_source : 43fd8b87cfa5816bc3e05f21c5994bd9cdc2d29b
Bug 855453 - Move UnixSocket connect delay to main thread cancelable task; r=mrbkap

--HG--
extra : rebase_source : 1df9805896c85f0a97d42b74334a62b7b9baab68
Bug 853775: Update client.py to pull NSPR and NSS from Mercurial instead of CVS, r=kaie
Bug 820022 - Add null check for layerView. r=margaret
Bug 856877 - Initialize JSRuntime::interrupt.  r=wmccloskey.

--HG--
extra : rebase_source : 793f3357ea5850ecc282c7c150a8bdf71b5b78f9
Bug 742537 - Remove HTMLMediaElement.initialTime attribute. r=cpearce,doublec
Bug 854396 - OdinMonkey: make 'unsigned' not be a subtype of 'extern' (r=sstangl)

--HG--
extra : rebase_source : d3edd1114ef097d8bdde537bcfc74ddee77e40d0
Bug 854564 - Fix SPS crash when running asm.js (r=sstangl)

--HG--
extra : rebase_source : 17be1e7c2425d9c821981bd3158f97da2d152f2a