Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/WebDriverCommandExecutor.php
	lib/support/events/EventFiringWebElement.php