Bug 945387 - Use mocha-json-proxy exported write() to output the results... a=bajaj a=NPOTB
Bug 949209 - We now get src in detail. a=bajaj a=NPOTB
Bug 949209 - make the src available if gaia is a bit older as well. r=julienw a=bajaj a=NPOTB
Bug 917717 - Collect the memory usage for the process after running the start test. r=vivien a=bajaj a=NPOTB

Conflicts:
	package.json
Bug 917717 - Part 2: use the prebuilt ffi. r=gaye a=bajaj a=NPOTB

Conflicts:
	package.json
Bug 959138 - Fix the perf event test reporting. r=julienw a=bajaj a=NPOTB
Bug 964888 - blacklist fullscreen test app. r=julienw a=bajaj a=NPOTB
Bug 962040 - Require marionette-device-host 0.0.2 to avoid spurious stdout output r=julienw a=bajaj a=NPOTB

Conflicts:
	package.json
Bug 962040 - blacklist camera until we figure out why it hangs. r=julienw a=bajaj a=NPOTB
Bug 962040 - Add bug # in comments to reenable apps. r=julienw a=bajaj a=NPOTB
Bug 962040 - Catch errors to not break the JSON output r=julienw a=bajaj a=NPOTB
Bug 969210 - Rewrite the parser to be more permissive and foresee more changes. r=julienw a=bajaj a=NPOTB
Bug 972166 - MemInfo was not safe to call twice. r=julienw a=bajaj a=NPOTB
Bug 947442 - Assert if no results have been collected. r=julienw a=bajaj a=NPOTB
Bug 958652 - pass MOZPERFOUT to redirect mozperf JSON data to a file. Default == stdout. r=julienw a=bajaj a=NPOTB

Conflicts:
	Makefile
Bug 958652 - Part 2: MOZPERFOUT must be passed on in the Makefile. r=davehunt a=bajaj a=NPOTB
Bug 951235 - Fix improper use of back ticks to output. r=julienw a=bajaj a=NPOTB
Bug 958340 - Download node_modules from github a=bajaj a=NPOTB

Conflicts:
	.gitignore
	.travis.yml
	Makefile
Bug 980972 - assert if we actually timeout. r=julienw a=bajaj a=NPOTB
Bug 975233 - Reorganize the rules for installing node.js modules r=yurenju a=bajaj a=NPOTB

Conflicts:
	Makefile