Merged for Appium V1.2.0