Merge branch 'master' into development

# Conflicts:
#	code/modules/admin/admin_verbs.dm

code/controllers/configuration.dm

@@ -103,6 +103,7 @@ var/list/gamemode_cache = list()
 	var/banappeals
 	var/wikiurl
 	var/forumurl
+	var/forum_passphrase
 	var/githuburl
 
 	//Alert level description
@@ -458,6 +459,9 @@ var/list/gamemode_cache = list()
 				if ("forumurl")
 					config.forumurl = value
 
+				if ("forum_passphrase")
+					config.forum_passphrase = value
+
 				if ("githuburl")
 					config.githuburl = value