Merge branch 'master' into develop

src/upgrade.js

@@ -425,15 +425,18 @@ Upgrade.upgrade = function (callback) {
 					'waterdrop-low.mp3': 'Default | Water drop (low)',
 				};
 
+				db.getObject('settings:sounds', function (err, settings) {
+					if (err) {
+						return next(err);
+					} else if (!settings) {
+						winston.info(schemaName + ' - done');
+						return Upgrade.update(thisSchemaDate, next);
+					}
+
 					async.parallel([
 						function (cb) {
 							var keys = ['chat-incoming', 'chat-outgoing', 'notification'];
 
-						db.getObject('settings:sounds', function (err, settings) {
-							if (err || !settings) {
-								return cb(err);
-							}
-
 							keys.forEach(function (key) {
 								if (settings[key] && settings[key].indexOf(' | ') === -1) {
 									settings[key] = map[settings[key]] || '';
@@ -441,7 +444,6 @@ Upgrade.upgrade = function (callback) {
 							});
 
 							meta.configs.setMultiple(settings, cb);
-						});
 						},
 						function (cb) {
 							var keys = ['notificationSound', 'incomingChatSound', 'outgoingChatSound'];
@@ -468,11 +470,12 @@ Upgrade.upgrade = function (callback) {
 						if (err) {
 							return next(err);
 						}
-					winston.verbose(schemaName + ' - done');
+						winston.info(schemaName + ' - done');
 						Upgrade.update(thisSchemaDate, next);
 					});
+				});
 			} else {
-				winston.verbose(schemaName + ' - skipped!');
+				winston.info(schemaName + ' - skipped!');
 				next();
 			}
 		},