Bug 863600 - Intermittent browser_toolbox_options.js; r=me
Merge fx-team to m-c.
Merge inbound to m-c.
Merge m-c to inbound.
Bug 863788 - move checking for haveDumpedScreen into dumpScreen; r=jmaher
Bug 863377 - Marionette socket exceptions prevented from propagating, r=jgriffin
Bug 863559 - Do not leak the mach port in PlatformThread::CurrentId; r=jlebar
Bug 849589 - Add more descriptive error messages to NativeZip exceptions. r=glandium
Bug 863490 - Part 1: Get the correct JNIEnv for the worker thread that is destroying the Flash plugin. r=blassey
Bug 863490 - Part 2: Assert GetJNIEnv() is called on the correct thread. r=blassey