Merge remote-tracking branch 'upstream/master' into dev

Conflicts:
	code/__HELPERS/unsorted.dm

code/modules/admin/verbs/randomverbs.dm

@@ -80,12 +80,17 @@
 
 	var/missing_ages = 0
 	var/msg = ""
+
+	var/highlight_special_characters = 1
+	if(is_mentor(usr.client))
+		highlight_special_characters = 0
+
 	for(var/client/C in clients)
 		if(C.player_age == "Requires database")
 			missing_ages = 1
 			continue
 		if(C.player_age < age)
-			msg += "[key_name_admin(C)]: account is [C.player_age] days old<br>"
+			msg += "[key_name(C, 1, 1, highlight_special_characters)]: account is [C.player_age] days old<br>"
 	
 	if(missing_ages)
 		src << "Some accounts did not have proper ages set in their clients.  This function requires database to be present"