Merge branch 'master' into gdpr-download

graph/typeDefs.graphql

@@ -838,6 +838,9 @@ type Settings {
   # organizationName is the name of the organization.
   organizationName: String
 
+  # organizationContactEmail is the email of the organization.
+  organizationContactEmail: String
+
   # wordlist will return a given list of words.
   wordlist: Wordlist
 
@@ -1294,6 +1297,9 @@ input UpdateSettingsInput {
   # organizationName is the name of the organization.
   organizationName: String
 
+  # organizationContactEmail is the email of the organization.
+  organizationContactEmail: String
+
   # editCommentWindowLength is the length of time (in milliseconds) after a
   # comment is posted that it can still be edited by the author.
   editCommentWindowLength: Int