Merge branch 'master' of https://github.com/appium/appium into background-android2
Fix lint error (replace tab with spaces)