diff --git a/plugins/Admin/config.py b/plugins/Admin/config.py
index c8995d2ce..49a018483 100644
--- a/plugins/Admin/config.py
+++ b/plugins/Admin/config.py
@@ -35,7 +35,7 @@ _ = PluginInternationalization('Admin')
 
 def configure(advanced):
     # This will be called by supybot to configure this module.  advanced is
-    # a bool that specifies whether the user identified himself as an advanced
+    # a bool that specifies whether the user identified themself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
     from supybot.questions import expect, anything, something, yn
diff --git a/plugins/Aka/config.py b/plugins/Aka/config.py
index 60a054b5b..59e3d0274 100644
--- a/plugins/Aka/config.py
+++ b/plugins/Aka/config.py
@@ -40,7 +40,7 @@ except:
 
 def configure(advanced):
     # This will be called by supybot to configure this module.  advanced is
-    # a bool that specifies whether the user identified himself as an advanced
+    # a bool that specifies whether the user identified themself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
     from supybot.questions import expect, anything, something, yn
diff --git a/plugins/Alias/config.py b/plugins/Alias/config.py
index 036ddcfdd..6b5cad431 100644
--- a/plugins/Alias/config.py
+++ b/plugins/Alias/config.py
@@ -34,7 +34,7 @@ _ = PluginInternationalization('Alias')
 
 def configure(advanced):
     # This will be called by supybot to configure this module.  advanced is
-    # a bool that specifies whether the user identified himself as an advanced
+    # a bool that specifies whether the user identified themself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
     from supybot.questions import expect, anything, something, yn
diff --git a/plugins/Anonymous/config.py b/plugins/Anonymous/config.py
index de7aa590c..d48f4443c 100644
--- a/plugins/Anonymous/config.py
+++ b/plugins/Anonymous/config.py
@@ -34,7 +34,7 @@ _ = PluginInternationalization('Anonymous')
 
 def configure(advanced):
     # This will be called by supybot to configure this module.  advanced is
-    # a bool that specifies whether the user identified himself as an advanced
+    # a bool that specifies whether the user identified themself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
     from supybot.questions import expect, anything, something, yn
diff --git a/plugins/AutoMode/config.py b/plugins/AutoMode/config.py
index aa163e1b9..469477e3d 100644
--- a/plugins/AutoMode/config.py
+++ b/plugins/AutoMode/config.py
@@ -34,7 +34,7 @@ _ = PluginInternationalization('AutoMode')
 
 def configure(advanced):
     # This will be called by supybot to configure this module.  advanced is
-    # a bool that specifies whether the user identified himself as an advanced
+    # a bool that specifies whether the user identified themself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
     from supybot.questions import expect, anything, something, yn
diff --git a/plugins/Channel/config.py b/plugins/Channel/config.py
index ce64a6a42..a126b8640 100644
--- a/plugins/Channel/config.py
+++ b/plugins/Channel/config.py
@@ -37,7 +37,7 @@ _ = PluginInternationalization('Channel')
 
 def configure(advanced):
     # This will be called by supybot to configure this module.  advanced is
-    # a bool that specifies whether the user identified himself as an advanced
+    # a bool that specifies whether the user identified themself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
     from supybot.questions import expect, anything, something, yn
diff --git a/plugins/Channel/locales/de.po b/plugins/Channel/locales/de.po
index c11e53aed..9729b1ac4 100644
--- a/plugins/Channel/locales/de.po
+++ b/plugins/Channel/locales/de.po
@@ -286,7 +286,7 @@ msgid "I cowardly refuse to ban myself."
 msgstr "Ich bin zu feige um mich selbst zu bannen."
 
 #: plugin.py:353
-msgid "%s has %s too, you can't ban him/her/it."
+msgid "%s has %s too, you can't ban them."
 msgstr "%s hat auch %s, du kannst ihn/sie/es nicht bannen."
 
 #: plugin.py:365
diff --git a/plugins/Channel/locales/fi.po b/plugins/Channel/locales/fi.po
index ac147ac93..3754d2fff 100644
--- a/plugins/Channel/locales/fi.po
+++ b/plugins/Channel/locales/fi.po
@@ -445,7 +445,7 @@ msgid "I cowardly refuse to ban myself."
 msgstr "Minä pelkurimaisesti kieltäydyn antamasta itselleni porttikieltoa."
 
 #: plugin.py:403
-msgid "%s has %s too, you can't ban him/her/it."
+msgid "%s has %s too, you can't ban them."
 msgstr ""
 "Käyttäjälltä %s on myös valtuus %s, et voi antaa hänelle/sille porttikieltoa."
 
diff --git a/plugins/Channel/locales/fr.po b/plugins/Channel/locales/fr.po
index d7899108d..2b4f2e8c7 100644
--- a/plugins/Channel/locales/fr.po
+++ b/plugins/Channel/locales/fr.po
@@ -395,7 +395,7 @@ msgid "I cowardly refuse to ban myself."
 msgstr "Je suis trop couard pour me bannir moi-même."
 
 #: plugin.py:398
-msgid "%s has %s too, you can't ban him/her/it."
+msgid "%s has %s too, you can't ban them."
 msgstr "%s est aussi %s, je ne peux le/la bannir."
 
 #: plugin.py:410
diff --git a/plugins/Channel/locales/hu.po b/plugins/Channel/locales/hu.po
index ed685d8aa..2dc5bce5b 100644
--- a/plugins/Channel/locales/hu.po
+++ b/plugins/Channel/locales/hu.po
@@ -286,7 +286,7 @@ msgid "I cowardly refuse to ban myself."
 msgstr "Gyáván megtagadom, hogy kitiltsam magam."
 
 #: plugin.py:353
-msgid "%s has %s too, you can't ban him/her/it."
+msgid "%s has %s too, you can't ban them."
 msgstr "%s-nek is van %s, nem tilthatod ki őt."
 
 #: plugin.py:365
diff --git a/plugins/Channel/locales/it.po b/plugins/Channel/locales/it.po
index fa587c7fe..b7213fc7e 100644
--- a/plugins/Channel/locales/it.po
+++ b/plugins/Channel/locales/it.po
@@ -340,7 +340,7 @@ msgid "I cowardly refuse to ban myself."
 msgstr "Codardamente mi rifiuto di bannare stesso."
 
 #: plugin.py:351
-msgid "%s has %s too, you can't ban him/her/it."
+msgid "%s has %s too, you can't ban them."
 msgstr "anche %s ha %s, non puoi bannarlo/a."
 
 #: plugin.py:363
diff --git a/plugins/Channel/messages.pot b/plugins/Channel/messages.pot
index a2ad11bf0..bf0541507 100644
--- a/plugins/Channel/messages.pot
+++ b/plugins/Channel/messages.pot
@@ -286,7 +286,7 @@ msgid "I cowardly refuse to ban myself."
 msgstr ""
 
 #: plugin.py:403
-msgid "%s has %s too, you can't ban him/her/it."
+msgid "%s has %s too, you can't ban them."
 msgstr ""
 
 #: plugin.py:414
diff --git a/plugins/Channel/plugin.py b/plugins/Channel/plugin.py
index 5b04ad235..118c8d30f 100644
--- a/plugins/Channel/plugin.py
+++ b/plugins/Channel/plugin.py
@@ -401,7 +401,7 @@ class Channel(callbacks.Plugin):
                 self.log.warning('%s tried to ban %q, but both have %s',
                                  msg.prefix, bannedHostmask, capability)
                 irc.error(format(_('%s has %s too, you can\'t ban '
-                                 'him/her/it.'), bannedNick, capability))
+                                 'them.'), bannedNick, capability))
             else:
                 doBan()
         else:
diff --git a/plugins/ChannelLogger/config.py b/plugins/ChannelLogger/config.py
index 1cf78a869..575ac8dd2 100644
--- a/plugins/ChannelLogger/config.py
+++ b/plugins/ChannelLogger/config.py
@@ -35,7 +35,7 @@ _ = PluginInternationalization('ChannelLogger')
 
 def configure(advanced):
     # This will be called by supybot to configure this module.  advanced is
-    # a bool that specifies whether the user identified himself as an advanced
+    # a bool that specifies whether the user identified themself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
     from supybot.questions import expect, anything, something, yn
diff --git a/plugins/ChannelStats/config.py b/plugins/ChannelStats/config.py
index c4c359d0b..41aab6c83 100644
--- a/plugins/ChannelStats/config.py
+++ b/plugins/ChannelStats/config.py
@@ -37,7 +37,7 @@ _ = PluginInternationalization('ChannelStats')
 
 def configure(advanced):
     # This will be called by supybot to configure this module.  advanced is
-    # a bool that specifies whether the user identified himself as an advanced
+    # a bool that specifies whether the user identified themself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
     from supybot.questions import expect, anything, something, yn
diff --git a/plugins/Conditional/config.py b/plugins/Conditional/config.py
index f64814015..fdaf33e81 100644
--- a/plugins/Conditional/config.py
+++ b/plugins/Conditional/config.py
@@ -43,7 +43,7 @@ except:
 
 def configure(advanced):
     # This will be called by supybot to configure this module.  advanced is
-    # a bool that specifies whether the user identified himself as an advanced
+    # a bool that specifies whether the user identified themself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
     from supybot.questions import expect, anything, something, yn
diff --git a/plugins/Config/config.py b/plugins/Config/config.py
index 7f53e8208..20e4e836c 100644
--- a/plugins/Config/config.py
+++ b/plugins/Config/config.py
@@ -35,7 +35,7 @@ _ = PluginInternationalization('Config')
 
 def configure(advanced):
     # This will be called by supybot to configure this module.  advanced is
-    # a bool that specifies whether the user identified himself as an advanced
+    # a bool that specifies whether the user identified themself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
     from supybot.questions import expect, anything, something, yn
diff --git a/plugins/Ctcp/config.py b/plugins/Ctcp/config.py
index 866ad5f45..113b19223 100644
--- a/plugins/Ctcp/config.py
+++ b/plugins/Ctcp/config.py
@@ -34,7 +34,7 @@ _ = PluginInternationalization('Ctcp')
 
 def configure(advanced):
     # This will be called by supybot to configure this module.  advanced is
-    # a bool that specifies whether the user identified himself as an advanced
+    # a bool that specifies whether the user identified themself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
     from supybot.questions import expect, anything, something, yn
diff --git a/plugins/Dunno/config.py b/plugins/Dunno/config.py
index 819d888ce..a18e7c771 100644
--- a/plugins/Dunno/config.py
+++ b/plugins/Dunno/config.py
@@ -34,7 +34,7 @@ _ = PluginInternationalization('Dunno')
 
 def configure(advanced):
     # This will be called by supybot to configure this module.  advanced is
-    # a bool that specifies whether the user identified himself as an advanced
+    # a bool that specifies whether the user identified themself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
     from supybot.questions import expect, anything, something, yn
diff --git a/plugins/Factoids/config.py b/plugins/Factoids/config.py
index 84ac73250..97a54a0ec 100644
--- a/plugins/Factoids/config.py
+++ b/plugins/Factoids/config.py
@@ -35,7 +35,7 @@ _ = PluginInternationalization('Factoids')
 
 def configure(advanced):
     # This will be called by supybot to configure this module.  advanced is
-    # a bool that specifies whether the user identified himself as an advanced
+    # a bool that specifies whether the user identified themself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
     from supybot.questions import expect, anything, something, yn
diff --git a/plugins/Filter/config.py b/plugins/Filter/config.py
index cd45fa9cb..de5780c09 100644
--- a/plugins/Filter/config.py
+++ b/plugins/Filter/config.py
@@ -50,7 +50,7 @@ conf.registerChannelValue(Filter.shrink, 'minimum',
 
 def configure(advanced):
     # This will be called by supybot to configure this module.  advanced is
-    # a bool that specifies whether the user identified himself as an advanced
+    # a bool that specifies whether the user identified themself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
     from supybot.questions import expect, anything, something, yn
diff --git a/plugins/Format/config.py b/plugins/Format/config.py
index 5a0645d4c..5bd00e09c 100644
--- a/plugins/Format/config.py
+++ b/plugins/Format/config.py
@@ -34,7 +34,7 @@ _ = PluginInternationalization('Format')
 
 def configure(advanced):
     # This will be called by supybot to configure this module.  advanced is
-    # a bool that specifies whether the user identified himself as an advanced
+    # a bool that specifies whether the user identified themself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
     from supybot.questions import expect, anything, something, yn
diff --git a/plugins/Games/config.py b/plugins/Games/config.py
index 024d989d7..56ce3d5d4 100644
--- a/plugins/Games/config.py
+++ b/plugins/Games/config.py
@@ -34,7 +34,7 @@ _ = PluginInternationalization('Games')
 
 def configure(advanced):
     # This will be called by supybot to configure this module.  advanced is
-    # a bool that specifies whether the user identified himself as an advanced
+    # a bool that specifies whether the user identified themself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
     from supybot.questions import expect, anything, something, yn
diff --git a/plugins/Herald/config.py b/plugins/Herald/config.py
index 801865ea6..79b98b9d2 100644
--- a/plugins/Herald/config.py
+++ b/plugins/Herald/config.py
@@ -34,7 +34,7 @@ _ = PluginInternationalization('Herald')
 
 def configure(advanced):
     # This will be called by supybot to configure this module.  advanced is
-    # a bool that specifies whether the user identified himself as an advanced
+    # a bool that specifies whether the user identified themself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
     from supybot.questions import expect, anything, something, yn
diff --git a/plugins/Internet/config.py b/plugins/Internet/config.py
index cf7ff92c6..d4b4d0e4a 100644
--- a/plugins/Internet/config.py
+++ b/plugins/Internet/config.py
@@ -34,7 +34,7 @@ _ = PluginInternationalization('Internet')
 
 def configure(advanced):
     # This will be called by supybot to configure this module.  advanced is
-    # a bool that specifies whether the user identified himself as an advanced
+    # a bool that specifies whether the user identified themself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
     from supybot.questions import expect, anything, something, yn
diff --git a/plugins/Karma/config.py b/plugins/Karma/config.py
index 408bf32bb..4610d6d30 100644
--- a/plugins/Karma/config.py
+++ b/plugins/Karma/config.py
@@ -34,7 +34,7 @@ _ = PluginInternationalization('Karma')
 
 def configure(advanced):
     # This will be called by supybot to configure this module.  advanced is
-    # a bool that specifies whether the user identified himself as an advanced
+    # a bool that specifies whether the user identified themself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
     from supybot.questions import expect, anything, something, yn
diff --git a/plugins/Lart/config.py b/plugins/Lart/config.py
index 3ad4aab1f..b94123385 100644
--- a/plugins/Lart/config.py
+++ b/plugins/Lart/config.py
@@ -34,7 +34,7 @@ _ = PluginInternationalization('Lart')
 
 def configure(advanced):
     # This will be called by supybot to configure this module.  advanced is
-    # a bool that specifies whether the user identified himself as an advanced
+    # a bool that specifies whether the user identified themself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
     from supybot.questions import expect, anything, something, yn
diff --git a/plugins/Later/config.py b/plugins/Later/config.py
index e3d8803ba..5058a69e9 100644
--- a/plugins/Later/config.py
+++ b/plugins/Later/config.py
@@ -34,7 +34,7 @@ _ = PluginInternationalization('Later')
 
 def configure(advanced):
     # This will be called by setup.py to configure this module.  Advanced is
-    # a bool that specifies whether the user identified himself as an advanced
+    # a bool that specifies whether the user identified themself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
     from supybot.questions import expect, anything, something, yn
diff --git a/plugins/Limiter/config.py b/plugins/Limiter/config.py
index 64905d240..560e0b426 100644
--- a/plugins/Limiter/config.py
+++ b/plugins/Limiter/config.py
@@ -34,7 +34,7 @@ _ = PluginInternationalization('Limiter')
 
 def configure(advanced):
     # This will be called by supybot to configure this module.  advanced is
-    # a bool that specifies whether the user identified himself as an advanced
+    # a bool that specifies whether the user identified themself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
     from supybot.questions import expect, anything, something, yn
diff --git a/plugins/Math/config.py b/plugins/Math/config.py
index db6474c78..2815767ab 100644
--- a/plugins/Math/config.py
+++ b/plugins/Math/config.py
@@ -34,7 +34,7 @@ _ = PluginInternationalization('Math')
 
 def configure(advanced):
     # This will be called by supybot to configure this module.  advanced is
-    # a bool that specifies whether the user identified himself as an advanced
+    # a bool that specifies whether the user identified themself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
     from supybot.questions import expect, anything, something, yn
diff --git a/plugins/MessageParser/config.py b/plugins/MessageParser/config.py
index 5a884bd19..69bf7dd36 100644
--- a/plugins/MessageParser/config.py
+++ b/plugins/MessageParser/config.py
@@ -43,7 +43,7 @@ except:
 
 def configure(advanced):
     # This will be called by supybot to configure this module.  advanced is
-    # a bool that specifies whether the user identified himself as an advanced
+    # a bool that specifies whether the user identified themself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
     from supybot.questions import expect, anything, something, yn
diff --git a/plugins/Misc/config.py b/plugins/Misc/config.py
index 009bc080e..a726b02e5 100644
--- a/plugins/Misc/config.py
+++ b/plugins/Misc/config.py
@@ -34,7 +34,7 @@ _ = PluginInternationalization('Misc')
 
 def configure(advanced):
     # This will be called by supybot to configure this module.  advanced is
-    # a bool that specifies whether the user identified himself as an advanced
+    # a bool that specifies whether the user identified themself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
     from supybot.questions import expect, anything, something, yn
diff --git a/plugins/MoobotFactoids/config.py b/plugins/MoobotFactoids/config.py
index 07f55889c..68b3fa82d 100644
--- a/plugins/MoobotFactoids/config.py
+++ b/plugins/MoobotFactoids/config.py
@@ -34,7 +34,7 @@ _ = PluginInternationalization('MoobotFactoids')
 
 def configure(advanced):
     # This will be called by supybot to configure this module.  advanced is
-    # a bool that specifies whether the user identified himself as an advanced
+    # a bool that specifies whether the user identified themself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
     from supybot.questions import expect, anything, something, yn
diff --git a/plugins/Network/config.py b/plugins/Network/config.py
index c1cf102ef..c24262cc7 100644
--- a/plugins/Network/config.py
+++ b/plugins/Network/config.py
@@ -34,7 +34,7 @@ _ = PluginInternationalization('Network')
 
 def configure(advanced):
     # This will be called by supybot to configure this module.  advanced is
-    # a bool that specifies whether the user identified himself as an advanced
+    # a bool that specifies whether the user identified themself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
     from supybot.questions import expect, anything, something, yn
diff --git a/plugins/News/config.py b/plugins/News/config.py
index 2a2e0e8f4..6d9d501f0 100644
--- a/plugins/News/config.py
+++ b/plugins/News/config.py
@@ -34,7 +34,7 @@ _ = PluginInternationalization('News')
 
 def configure(advanced):
     # This will be called by supybot to configure this module.  advanced is
-    # a bool that specifies whether the user identified himself as an advanced
+    # a bool that specifies whether the user identified themself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
     from supybot.questions import expect, anything, something, yn
diff --git a/plugins/NickAuth/config.py b/plugins/NickAuth/config.py
index f8939e76f..1fff0b940 100644
--- a/plugins/NickAuth/config.py
+++ b/plugins/NickAuth/config.py
@@ -36,7 +36,7 @@ _ = PluginInternationalization('NickAuth')
 
 def configure(advanced):
     # This will be called by supybot to configure this module.  advanced is
-    # a bool that specifies whether the user identified himself as an advanced
+    # a bool that specifies whether the user identified themself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
     from supybot.questions import expect, anything, something, yn
diff --git a/plugins/NickCapture/config.py b/plugins/NickCapture/config.py
index a333679a3..3560a24ce 100644
--- a/plugins/NickCapture/config.py
+++ b/plugins/NickCapture/config.py
@@ -34,7 +34,7 @@ _ = PluginInternationalization('NickCapture')
 
 def configure(advanced):
     # This will be called by supybot to configure this module.  advanced is
-    # a bool that specifies whether the user identified himself as an advanced
+    # a bool that specifies whether the user identified themself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
     from supybot.questions import expect, anything, something, yn
diff --git a/plugins/Nickometer/config.py b/plugins/Nickometer/config.py
index c8945d41f..c70f75851 100644
--- a/plugins/Nickometer/config.py
+++ b/plugins/Nickometer/config.py
@@ -35,7 +35,7 @@ _ = PluginInternationalization('Nickometer')
 
 def configure(advanced):
     # This will be called by setup.py to configure this module.  Advanced is
-    # a bool that specifies whether the user identified himself as an advanced
+    # a bool that specifies whether the user identified themself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
     from supybot.questions import expect, anything, something, yn
diff --git a/plugins/Note/config.py b/plugins/Note/config.py
index b3be8b120..90b2610eb 100644
--- a/plugins/Note/config.py
+++ b/plugins/Note/config.py
@@ -34,7 +34,7 @@ _ = PluginInternationalization('Note')
 
 def configure(advanced):
     # This will be called by supybot to configure this module.  advanced is
-    # a bool that specifies whether the user identified himself as an advanced
+    # a bool that specifies whether the user identified themself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
     from supybot.questions import expect, anything, something, yn
diff --git a/plugins/Owner/config.py b/plugins/Owner/config.py
index cd0fe0f94..25e5d9915 100644
--- a/plugins/Owner/config.py
+++ b/plugins/Owner/config.py
@@ -35,7 +35,7 @@ _ = PluginInternationalization('Owner')
 
 def configure(advanced):
     # This will be called by supybot to configure this module.  advanced is
-    # a bool that specifies whether the user identified himself as an advanced
+    # a bool that specifies whether the user identified themself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
     from supybot.questions import expect, anything, something, yn
diff --git a/plugins/Plugin/config.py b/plugins/Plugin/config.py
index f9d0cd673..aded99093 100644
--- a/plugins/Plugin/config.py
+++ b/plugins/Plugin/config.py
@@ -34,7 +34,7 @@ _ = PluginInternationalization('Plugin')
 
 def configure(advanced):
     # This will be called by supybot to configure this module.  advanced is
-    # a bool that specifies whether the user identified himself as an advanced
+    # a bool that specifies whether the user identified themself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
     from supybot.questions import expect, anything, something, yn
diff --git a/plugins/PluginDownloader/config.py b/plugins/PluginDownloader/config.py
index 0a8db927f..aec22e9ab 100644
--- a/plugins/PluginDownloader/config.py
+++ b/plugins/PluginDownloader/config.py
@@ -36,7 +36,7 @@ _ = PluginInternationalization('PluginDownloader')
 
 def configure(advanced):
     # This will be called by supybot to configure this module.  advanced is
-    # a bool that specifies whether the user identified himself as an advanced
+    # a bool that specifies whether the user identified themself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
     from supybot.questions import expect, anything, something, yn
diff --git a/plugins/Praise/config.py b/plugins/Praise/config.py
index fc5aadd62..4f24abfc9 100644
--- a/plugins/Praise/config.py
+++ b/plugins/Praise/config.py
@@ -34,7 +34,7 @@ _ = PluginInternationalization('Praise')
 
 def configure(advanced):
     # This will be called by supybot to configure this module.  advanced is
-    # a bool that specifies whether the user identified himself as an advanced
+    # a bool that specifies whether the user identified themself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
     from supybot.questions import expect, anything, something, yn
diff --git a/plugins/Protector/config.py b/plugins/Protector/config.py
index b4d10f417..dce6e5c66 100644
--- a/plugins/Protector/config.py
+++ b/plugins/Protector/config.py
@@ -35,7 +35,7 @@ _ = PluginInternationalization('Protector')
 
 def configure(advanced):
     # This will be called by supybot to configure this module.  advanced is
-    # a bool that specifies whether the user identified himself as an advanced
+    # a bool that specifies whether the user identified themself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
     from supybot.questions import expect, anything, something, yn
diff --git a/plugins/Quote/config.py b/plugins/Quote/config.py
index 1d1a2cfeb..2d5451f26 100644
--- a/plugins/Quote/config.py
+++ b/plugins/Quote/config.py
@@ -34,7 +34,7 @@ _ = PluginInternationalization('Quote')
 
 def configure(advanced):
     # This will be called by supybot to configure this module.  advanced is
-    # a bool that specifies whether the user identified himself as an advanced
+    # a bool that specifies whether the user identified themself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
     from supybot.questions import expect, anything, something, yn
diff --git a/plugins/QuoteGrabs/config.py b/plugins/QuoteGrabs/config.py
index 18219a8b3..0a59f01fb 100644
--- a/plugins/QuoteGrabs/config.py
+++ b/plugins/QuoteGrabs/config.py
@@ -34,7 +34,7 @@ _ = PluginInternationalization('QuoteGrabs')
 
 def configure(advanced):
     # This will be called by supybot to configure this module.  advanced is
-    # a bool that specifies whether the user identified himself as an advanced
+    # a bool that specifies whether the user identified themself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
     from supybot.questions import expect, anything, something, yn
diff --git a/plugins/RSS/config.py b/plugins/RSS/config.py
index 26665a827..4179f9e90 100644
--- a/plugins/RSS/config.py
+++ b/plugins/RSS/config.py
@@ -35,7 +35,7 @@ _ = PluginInternationalization('RSS')
 
 def configure(advanced):
     # This will be called by supybot to configure this module.  advanced is
-    # a bool that specifies whether the user identified himself as an advanced
+    # a bool that specifies whether the user identified themself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
     from supybot.questions import expect, anything, something, yn
diff --git a/plugins/Reply/config.py b/plugins/Reply/config.py
index f094cb36f..10000d187 100644
--- a/plugins/Reply/config.py
+++ b/plugins/Reply/config.py
@@ -34,7 +34,7 @@ _ = PluginInternationalization('Reply')
 
 def configure(advanced):
     # This will be called by supybot to configure this module.  advanced is
-    # a bool that specifies whether the user identified himself as an advanced
+    # a bool that specifies whether the user identified themself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
     from supybot.questions import expect, anything, something, yn
diff --git a/plugins/Scheduler/config.py b/plugins/Scheduler/config.py
index 9943c4557..74d679f0f 100644
--- a/plugins/Scheduler/config.py
+++ b/plugins/Scheduler/config.py
@@ -34,7 +34,7 @@ _ = PluginInternationalization('Scheduler')
 
 def configure(advanced):
     # This will be called by supybot to configure this module.  advanced is
-    # a bool that specifies whether the user identified himself as an advanced
+    # a bool that specifies whether the user identified themself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
     from supybot.questions import expect, anything, something, yn
diff --git a/plugins/Seen/config.py b/plugins/Seen/config.py
index dac39b82c..d04b0001f 100644
--- a/plugins/Seen/config.py
+++ b/plugins/Seen/config.py
@@ -34,7 +34,7 @@ _ = PluginInternationalization('Seen')
 
 def configure(advanced):
     # This will be called by supybot to configure this module.  advanced is
-    # a bool that specifies whether the user identified himself as an advanced
+    # a bool that specifies whether the user identified themself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
     from supybot.questions import expect, anything, something, yn
diff --git a/plugins/Status/config.py b/plugins/Status/config.py
index 56cda1717..14d5b4246 100644
--- a/plugins/Status/config.py
+++ b/plugins/Status/config.py
@@ -34,7 +34,7 @@ _ = PluginInternationalization('Status')
 
 def configure(advanced):
     # This will be called by supybot to configure this module.  advanced is
-    # a bool that specifies whether the user identified himself as an advanced
+    # a bool that specifies whether the user identified themself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
     from supybot.questions import expect, anything, something, yn
diff --git a/plugins/String/config.py b/plugins/String/config.py
index 2fc8d805e..c275a8265 100644
--- a/plugins/String/config.py
+++ b/plugins/String/config.py
@@ -34,7 +34,7 @@ _ = PluginInternationalization('String')
 
 def configure(advanced):
     # This will be called by supybot to configure this module.  advanced is
-    # a bool that specifies whether the user identified himself as an advanced
+    # a bool that specifies whether the user identified themself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
     from supybot.questions import expect, anything, something, yn
diff --git a/plugins/Success/config.py b/plugins/Success/config.py
index 72ddf49e3..241c82bd8 100644
--- a/plugins/Success/config.py
+++ b/plugins/Success/config.py
@@ -34,7 +34,7 @@ _ = PluginInternationalization('Success')
 
 def configure(advanced):
     # This will be called by supybot to configure this module.  advanced is
-    # a bool that specifies whether the user identified himself as an advanced
+    # a bool that specifies whether the user identified themself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
     from supybot.questions import expect, anything, something, yn
diff --git a/plugins/Time/config.py b/plugins/Time/config.py
index cb56cf3b5..78a9a48ac 100644
--- a/plugins/Time/config.py
+++ b/plugins/Time/config.py
@@ -34,7 +34,7 @@ _ = PluginInternationalization('Time')
 
 def configure(advanced):
     # This will be called by supybot to configure this module.  advanced is
-    # a bool that specifies whether the user identified himself as an advanced
+    # a bool that specifies whether the user identified themself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
     from supybot.questions import expect, anything, something, yn
diff --git a/plugins/Todo/config.py b/plugins/Todo/config.py
index 9aa92bae8..2a231f7e2 100644
--- a/plugins/Todo/config.py
+++ b/plugins/Todo/config.py
@@ -34,7 +34,7 @@ _ = PluginInternationalization('Todo')
 
 def configure(advanced):
     # This will be called by supybot to configure this module.  advanced is
-    # a bool that specifies whether the user identified himself as an advanced
+    # a bool that specifies whether the user identified themself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
     from supybot.questions import expect, anything, something, yn
diff --git a/plugins/Topic/config.py b/plugins/Topic/config.py
index 5bbe8f200..253ed457f 100644
--- a/plugins/Topic/config.py
+++ b/plugins/Topic/config.py
@@ -34,7 +34,7 @@ _ = PluginInternationalization('Topic')
 
 def configure(advanced):
     # This will be called by supybot to configure this module.  advanced is
-    # a bool that specifies whether the user identified himself as an advanced
+    # a bool that specifies whether the user identified themself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
     from supybot.questions import expect, anything, something, yn
diff --git a/plugins/URL/config.py b/plugins/URL/config.py
index b7eb056d9..38ec147a6 100644
--- a/plugins/URL/config.py
+++ b/plugins/URL/config.py
@@ -34,7 +34,7 @@ _ = PluginInternationalization('URL')
 
 def configure(advanced):
     # This will be called by supybot to configure this module.  advanced is
-    # a bool that specifies whether the user identified himself as an advanced
+    # a bool that specifies whether the user identified themself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
     from supybot.questions import expect, anything, something, yn
diff --git a/plugins/Unix/config.py b/plugins/Unix/config.py
index d08dcdf8e..a81fb5211 100644
--- a/plugins/Unix/config.py
+++ b/plugins/Unix/config.py
@@ -39,7 +39,7 @@ progstats = plugin.progstats
 
 def configure(advanced):
     # This will be called by supybot to configure this module.  advanced is
-    # a bool that specifies whether the user identified himself as an advanced
+    # a bool that specifies whether the user identified themself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
     from supybot.questions import output, expect, anything, something, yn
diff --git a/plugins/User/config.py b/plugins/User/config.py
index 2a6e73f5f..0a45a80ab 100644
--- a/plugins/User/config.py
+++ b/plugins/User/config.py
@@ -35,7 +35,7 @@ _ = PluginInternationalization('User')
 
 def configure(advanced):
     # This will be called by supybot to configure this module.  advanced is
-    # a bool that specifies whether the user identified himself as an advanced
+    # a bool that specifies whether the user identified themself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
     from supybot.questions import expect, anything, something, yn
diff --git a/plugins/Utilities/config.py b/plugins/Utilities/config.py
index 078320f5f..5280fc39f 100644
--- a/plugins/Utilities/config.py
+++ b/plugins/Utilities/config.py
@@ -34,7 +34,7 @@ _ = PluginInternationalization('Utilities')
 
 def configure(advanced):
     # This will be called by supybot to configure this module.  advanced is
-    # a bool that specifies whether the user identified himself as an advanced
+    # a bool that specifies whether the user identified themself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
     from supybot.questions import expect, anything, something, yn
diff --git a/plugins/Web/config.py b/plugins/Web/config.py
index e27f0da29..4c0554e55 100644
--- a/plugins/Web/config.py
+++ b/plugins/Web/config.py
@@ -34,7 +34,7 @@ _ = PluginInternationalization('Web')
 
 def configure(advanced):
     # This will be called by supybot to configure this module.  advanced is
-    # a bool that specifies whether the user identified himself as an advanced
+    # a bool that specifies whether the user identified themself as an advanced
     # user or not.  You should effect your configuration by manipulating the
     # registry as appropriate.
     from supybot.questions import expect, anything, something, yn
diff --git a/src/schedule.py b/src/schedule.py
index 7019790ae..7264fa403 100644
--- a/src/schedule.py
+++ b/src/schedule.py
@@ -70,7 +70,7 @@ class Schedule(drivers.IrcDriver):
             self.events.clear()
             self.schedule[:] = []
         # We don't reset the counter here because if someone has held an id of
-        # one of the nuked events, we don't want him/her removing new events with
+        # one of the nuked events, we don't want them removing new events with
         # his/her old id.
 
     def name(self):