Fix
Merge branch 'fix' into webdriver-without-remote
Test