Prepreared merge of Drive File Upload branch.
Merge remote-tracking branch 'github/master'
Added auto generated files to ignore list.