Selenium timeout fixes
Merge branch 'Selenium-Timeout'