Merge branch 'master' of github.com:appium/appium for appium v 1.2.3