Minor fault-tolerance + diagnostics changes.
Merge branch 'dev' of https://github.com/ios-driver/ios-driver.git into dev