Merge remote-tracking branch 'upstream/master' into bug_928366
Bug 9283660 - runtest fixes
Merge branch 'bug_928366' of github.com:jarekps/mozmill into bug_928366