Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/WebDriver.php
	lib/__init__.php