Bug fix: API key set-up for uploading
Merge branch 'master' into develop