Merge branch 'master' into develop

src/meta/js.js

@@ -108,6 +108,12 @@ module.exports = function (Meta) {
 						if (err) {
 							return cb(err);
 						}
+
+						if (filePath.endsWith('.min.js')) {
+							minified = { code: buffer.toString() };
+							return cb();
+						}
+
 						try {
 							minified = uglifyjs.minify(buffer.toString(), {
 								fromString: true,

src/socket.io/index.js

@@ -174,7 +174,7 @@ function checkMaintenance(socket, callback) {
 function validateSession(socket, callback) {
 	var req = socket.request;
 	if (!req.signedCookies || !req.signedCookies[nconf.get('sessionKey')]) {
-		return callback(new Error('[[error:invalid-session]]'));
+		return callback();
 	}
 	db.sessionStore.get(req.signedCookies[nconf.get('sessionKey')], function (err, sessionData) {
 		if (err || !sessionData) {