Merge branch 'master' into v0.5.x

package.json

@@ -2,7 +2,7 @@
   "name": "nodebb",
   "license": "GPLv3 or later",
   "description": "NodeBB Forum",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "homepage": "http://www.nodebb.org",
   "repository": {
     "type": "git",

src/user/profile.js

@@ -123,6 +123,8 @@ module.exports = function(User) {
 				return callback(err);
 			}
 
+			userData.email = userData.email || '';
+
 			if (userData.email === newEmail) {
 				return callback();
 			}