More weekend hack
Merge branch 'master' of https://github.com/atex-polopoly/google-drive-plugin