manually applying 113fe5ce1050c8f9
Merge branch 'master' of https://github.com/appium/appium-uiautomator