Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/WebDriver.php
	lib/WebDriverOptions.php
	lib/remote/WebDriverCommandExecutor.php