Merge remote-tracking branch 'origin/master'

Author: Salakar

lib/modules/storage.js

@@ -85,7 +85,7 @@ export default class Storage extends Base {
    */
   uploadFile(name: string, filePath: string, metadata: Object = {}, listener: Function = noop): Promise<Object> {
     const _filePath = filePath.replace('file://', '');
-    this.log.debug('uploadFile(', _filepath, ') -> ', name);
+    this.log.debug('uploadFile(', _filePath, ') -> ', name);
     const listeners = [
       this._addListener('upload_paused', listener),
       this._addListener('upload_resumed', listener),
@@ -98,7 +98,7 @@ export default class Storage extends Base {
         return res;
       })
       .catch(err => {
-        this.log.error('Error uploading file ', name, ' to ', filepath, '.  Error: ', err);
+        this.log.error('Error uploading file ', name, ' to ', _filePath, '.  Error: ', err);
         throw err;
       });
   }