Bug 948992 - Copy the deviceSerial to ADB's device manager. r=jgriffin
Bug 949398: fix missing MarionetteTestOptions. r=jgriffin
imported patch 950729
imported patch 951153
imported patch 950098
Bug 947205 - Test durations are missing from the HTML report. r=mdas
Bug 950641 - Automatically use the appropriate GeckoInstance class. r=jgriffin
Bug 957248 - Use marionette.timeout if no explicit timeout is given for Wait

---
 .../client/marionette/tests/unit/test_wait.py      | 38 +++++++++++++++-------
 testing/marionette/client/marionette/wait.py       | 25 +++++++-------
 2 files changed, 40 insertions(+), 23 deletions(-)
imported patch 956803
Bug 959730 - Move cleanup logic out of __del__, r=dburns
Bug 960375 - Marionette runner should pass mozinfo.info into manifestparser, r=mdas
[PATCH] Bug 961792 - Break iteration when browser is found

The iteration used to look up the current window's server-assigned
unique identifier in Marionette continues after the response has been
sent.  This is unnecessary and a potential synchronization problem
because the client only expects a single response.
---
 testing/marionette/marionette-server.js | 1 +
 1 file changed, 1 insertion(+)
imported patch 961874
Bug 958024 - Wrap last exception from Marionette's Wait in TimeoutException. r=davehunt, r=mdas
[PATCH] Bug 948075 - Add expected conditions to Marionette

---
 testing/marionette/client/marionette/expected.py   | 265 +++++++++++++++++++++
 .../client/marionette/tests/unit/test_expected.py  | 198 +++++++++++++++
 .../client/marionette/tests/unit/unit-tests.ini    |   3 +-
 3 files changed, 465 insertions(+), 1 deletion(-)
 create mode 100644 testing/marionette/client/marionette/expected.py
 create mode 100644 testing/marionette/client/marionette/tests/unit/test_expected.py
Bug 961648 - Provide a helpful error message when test variables JSON file cannot be parsed; r=dhunt
Bug 959520 - Make socket.timeout error messages more useful, r=jgriffin
Bug 963598 - Allow custom message when Wait.until times out. r=dburns
Bug 952530 - List all skipped/disabled tests rather than just the conditionally skipped tests. r=jgriffin
Bug 948895 - Increase wait-for-homescreen timeout, r=ahal