Update to 2.0.2
Merge pull request #2131 from selesse/genymotion

Update to 2.0.2