Merge branch 'master' into develop

install/data/welcome.md

@@ -1,9 +1,9 @@
-# Welcome to your brand new NodeBB forum!
+### Welcome to your brand new NodeBB forum!
 
 This is what a topic and post looks like. As an administrator, you can edit the post\'s title and content.
 To customise your forum, go to the [Administrator Control Panel](../../admin). You can modify all aspects of your forum there, including installation of third-party plugins.
 
-## Additional Resources
+#### Additional Resources
 
 * [NodeBB Documentation](https://docs.nodebb.org)
 * [Community Support Forum](https://community.nodebb.org)

src/middleware/csrf.js

@@ -12,7 +12,9 @@ const {
 			return req.headers['x-csrf-token'];
 		} else if (req.body && req.body.csrf_token) {
 			return req.body.csrf_token;
-		} else if (req.query) {
+		} else if (req.body && req.body._csrf) {
+			return req.body._csrf;
+		} else if (req.query && req.query._csrf) {
 			return req.query._csrf;
 		}
 	},