Merge branch 'master' of https://github.com/NodeBB/NodeBB

install/package.json

@@ -66,12 +66,12 @@
         "mousetrap": "^1.6.1",
         "mubsub-nbb": "^1.5.0",
         "nconf": "^0.10.0",
-        "nodebb-plugin-composer-default": "6.1.4",
+        "nodebb-plugin-composer-default": "6.1.5",
         "nodebb-plugin-dbsearch": "2.0.21",
         "nodebb-plugin-emoji": "^2.2.5",
         "nodebb-plugin-emoji-android": "2.0.0",
         "nodebb-plugin-markdown": "8.8.0",
-        "nodebb-plugin-mentions": "2.2.10",
+        "nodebb-plugin-mentions": "2.2.11",
         "nodebb-plugin-soundpack-default": "1.0.0",
         "nodebb-plugin-spam-be-gone": "0.5.4",
         "nodebb-rewards-essentials": "0.0.13",