diff --git a/lib/ansible/modules/extras/cloud/misc/ovirt.py b/lib/ansible/modules/extras/cloud/misc/ovirt.py
index 258637ddaec..718f25fec2c 100755
--- a/lib/ansible/modules/extras/cloud/misc/ovirt.py
+++ b/lib/ansible/modules/extras/cloud/misc/ovirt.py
@@ -20,7 +20,7 @@
 DOCUMENTATION = '''
 ---
 module: ovirt
-author: Vincent Van der Kussen
+author: '"Vincent Van der Kussen (@vincentvdk)" <vincent at vanderkussen.org>'
 short_description: oVirt/RHEV platform management
 description:
     - allows you to create new instances, either from scratch or an image, in addition to deleting or stopping instances on the oVirt/RHEV platform
diff --git a/lib/ansible/modules/extras/files/patch.py b/lib/ansible/modules/extras/files/patch.py
index e0d7d1d335d..c2982e2380e 100755
--- a/lib/ansible/modules/extras/files/patch.py
+++ b/lib/ansible/modules/extras/files/patch.py
@@ -22,7 +22,9 @@
 DOCUMENTATION = '''
 ---
 module: patch
-author: Luis Alberto Perez Lazaro, Jakub Jirutka
+author:
+    - '"Jakub Jirutka (@jirutka)" <jakub@jirutka.cz>'
+    - '"Luis Alberto Perez Lazaro (@luisperlaz)" <luisperlazaro@gmail.com>'
 version_added: 1.9
 description:
     - Apply patch files using the GNU patch tool.
diff --git a/lib/ansible/modules/extras/messaging/rabbitmq_parameter.py b/lib/ansible/modules/extras/messaging/rabbitmq_parameter.py
index 2f78bd4ee15..6be18bdce3d 100644
--- a/lib/ansible/modules/extras/messaging/rabbitmq_parameter.py
+++ b/lib/ansible/modules/extras/messaging/rabbitmq_parameter.py
@@ -25,7 +25,7 @@ short_description: Adds or removes parameters to RabbitMQ
 description:
   - Manage dynamic, cluster-wide parameters for RabbitMQ
 version_added: "1.1"
-author: Chris Hoffman
+author: '"Chris Hoffman (@chrishoffman)"'
 options:
   component:
     description:
diff --git a/lib/ansible/modules/extras/messaging/rabbitmq_plugin.py b/lib/ansible/modules/extras/messaging/rabbitmq_plugin.py
index 53c38f978d5..db23df3fcc8 100644
--- a/lib/ansible/modules/extras/messaging/rabbitmq_plugin.py
+++ b/lib/ansible/modules/extras/messaging/rabbitmq_plugin.py
@@ -25,7 +25,7 @@ short_description: Adds or removes plugins to RabbitMQ
 description:
   - Enables or disables RabbitMQ plugins
 version_added: "1.1"
-author: Chris Hoffman
+author: '"Chris Hoffman (@chrishoffman)"'
 options:
   names:
     description:
diff --git a/lib/ansible/modules/extras/messaging/rabbitmq_policy.py b/lib/ansible/modules/extras/messaging/rabbitmq_policy.py
index 800c3822d55..a4d94decbd1 100644
--- a/lib/ansible/modules/extras/messaging/rabbitmq_policy.py
+++ b/lib/ansible/modules/extras/messaging/rabbitmq_policy.py
@@ -26,7 +26,7 @@ short_description: Manage the state of policies in RabbitMQ.
 description:
   - Manage the state of a virtual host in RabbitMQ.
 version_added: "1.5"
-author: John Dewey
+author: '"John Dewey (@retr0h)" <john@dewey.ws>'
 options:
   name:
     description:
diff --git a/lib/ansible/modules/extras/messaging/rabbitmq_user.py b/lib/ansible/modules/extras/messaging/rabbitmq_user.py
index f494ce802d9..6333e42282e 100644
--- a/lib/ansible/modules/extras/messaging/rabbitmq_user.py
+++ b/lib/ansible/modules/extras/messaging/rabbitmq_user.py
@@ -25,7 +25,7 @@ short_description: Adds or removes users to RabbitMQ
 description:
   - Add or remove users to RabbitMQ and assign permissions
 version_added: "1.1"
-author: Chris Hoffman
+author: '"Chris Hoffman (@chrishoffman)"'
 options:
   user:
     description:
diff --git a/lib/ansible/modules/extras/messaging/rabbitmq_vhost.py b/lib/ansible/modules/extras/messaging/rabbitmq_vhost.py
index fd4b04a683f..dbde32393cb 100644
--- a/lib/ansible/modules/extras/messaging/rabbitmq_vhost.py
+++ b/lib/ansible/modules/extras/messaging/rabbitmq_vhost.py
@@ -26,7 +26,7 @@ short_description: Manage the state of a virtual host in RabbitMQ
 description:
   - Manage the state of a virtual host in RabbitMQ
 version_added: "1.1"
-author: Chris Hoffman
+author: '"Chris Hoffman (@choffman)"'
 options:
   name:
     description:
diff --git a/lib/ansible/modules/extras/monitoring/nagios.py b/lib/ansible/modules/extras/monitoring/nagios.py
index c564e712b04..64716e81c71 100644
--- a/lib/ansible/modules/extras/monitoring/nagios.py
+++ b/lib/ansible/modules/extras/monitoring/nagios.py
@@ -73,7 +73,7 @@ options:
     required: true
     default: null
 
-author: Tim Bielawa
+author: '"Tim Bielawa (@tbielawa)" <tbielawa@redhat.com>'
 requirements: [ "Nagios" ]
 '''
 
diff --git a/lib/ansible/modules/extras/network/citrix/netscaler.py b/lib/ansible/modules/extras/network/citrix/netscaler.py
index b2f87aa0d08..8f78e23caac 100644
--- a/lib/ansible/modules/extras/network/citrix/netscaler.py
+++ b/lib/ansible/modules/extras/network/citrix/netscaler.py
@@ -82,7 +82,7 @@ options:
     choices: ['yes', 'no']
 
 requirements: [ "urllib", "urllib2" ]
-author: Nandor Sivok
+author: '"Nandor Sivok (@dominis)" <nandor@gawker.com>'
 '''
 
 EXAMPLES = '''
diff --git a/lib/ansible/modules/extras/network/openvswitch_bridge.py b/lib/ansible/modules/extras/network/openvswitch_bridge.py
index 551ca707a2d..28df3e84426 100644
--- a/lib/ansible/modules/extras/network/openvswitch_bridge.py
+++ b/lib/ansible/modules/extras/network/openvswitch_bridge.py
@@ -22,7 +22,7 @@ DOCUMENTATION = '''
 ---
 module: openvswitch_bridge
 version_added: 1.4
-author: David Stygstra
+author: '"David Stygstra (@stygstra)" <david.stygstra@gmail.com>'
 short_description: Manage Open vSwitch bridges
 requirements: [ ovs-vsctl ]
 description:
diff --git a/lib/ansible/modules/extras/network/openvswitch_port.py b/lib/ansible/modules/extras/network/openvswitch_port.py
index 66391937d1b..ab87ea42b4a 100644
--- a/lib/ansible/modules/extras/network/openvswitch_port.py
+++ b/lib/ansible/modules/extras/network/openvswitch_port.py
@@ -22,7 +22,7 @@ DOCUMENTATION = '''
 ---
 module: openvswitch_port
 version_added: 1.4
-author: David Stygstra
+author: '"David Stygstra (@stygstra)" <david.stygstra@gmail.com>'
 short_description: Manage Open vSwitch ports
 requirements: [ ovs-vsctl ]
 description:
diff --git a/lib/ansible/modules/extras/notification/grove.py b/lib/ansible/modules/extras/notification/grove.py
index 8f4ec42be58..5c27b18c30f 100644
--- a/lib/ansible/modules/extras/notification/grove.py
+++ b/lib/ansible/modules/extras/notification/grove.py
@@ -25,11 +25,11 @@ options:
     required: true
   url:
     description:
-      - Service URL for the web client 
+      - Service URL for the web client
     required: false
   icon_url:
     description:
-      -  Icon for the service 
+      -  Icon for the service
     required: false
   validate_certs:
     description:
@@ -39,7 +39,7 @@ options:
     default: 'yes'
     choices: ['yes', 'no']
     version_added: 1.5.1
-author: Jonas Pfenniger <zimbatm@zimbatm.com>
+author: '"Jonas Pfenniger (@zimbatm)" <zimbatm@zimbatm.com>'
 '''
 
 EXAMPLES = '''
diff --git a/lib/ansible/modules/extras/notification/irc.py b/lib/ansible/modules/extras/notification/irc.py
index a90834f820d..8b87c41f1ba 100644
--- a/lib/ansible/modules/extras/notification/irc.py
+++ b/lib/ansible/modules/extras/notification/irc.py
@@ -80,7 +80,9 @@ options:
 
 # informational: requirements for nodes
 requirements: [ socket ]
-author: Jan-Piet Mens, Matt Martz
+author:
+    - '"Jan-Piet Mens (@jpmens)"'
+    - '"Matt Martz (@sivel)"'
 '''
 
 EXAMPLES = '''
diff --git a/lib/ansible/modules/extras/notification/mail.py b/lib/ansible/modules/extras/notification/mail.py
index 6dc3da533e6..4feaebf5d36 100644
--- a/lib/ansible/modules/extras/notification/mail.py
+++ b/lib/ansible/modules/extras/notification/mail.py
@@ -20,7 +20,7 @@
 
 DOCUMENTATION = """
 ---
-author: Dag Wieers
+author: '"Dag Wieers (@dagwieers)" <dag@wieers.com>'
 module: mail
 short_description: Send an email
 description:
diff --git a/lib/ansible/modules/extras/notification/nexmo.py b/lib/ansible/modules/extras/notification/nexmo.py
index d4898c40cdb..a1dd9c2b64d 100644
--- a/lib/ansible/modules/extras/notification/nexmo.py
+++ b/lib/ansible/modules/extras/notification/nexmo.py
@@ -24,7 +24,7 @@ short_description: Send a SMS via nexmo
 description:
     - Send a SMS message via nexmo
 version_added: 1.6
-author: Matt Martz
+author: '"Matt Martz (@sivel)" <matt@sivel.net>'
 options:
   api_key:
     description:
diff --git a/lib/ansible/modules/extras/packaging/language/maven_artifact.py b/lib/ansible/modules/extras/packaging/language/maven_artifact.py
index f5d8f185a55..d6dd33166dc 100644
--- a/lib/ansible/modules/extras/packaging/language/maven_artifact.py
+++ b/lib/ansible/modules/extras/packaging/language/maven_artifact.py
@@ -37,7 +37,7 @@ description:
     - Downloads an artifact from a maven repository given the maven coordinates provided to the module. Can retrieve
     - snapshots or release versions of the artifact and will resolve the latest available version if one is not
     - available.
-author: Chris Schmidt <chris.schmidt () contrastsecurity.com>
+author: '"Chris Schmidt (@chrisisbeef)" <chris.schmidt () contrastsecurity.com>'
 requirements:
     - "python >= 2.6"
     - lxml
diff --git a/lib/ansible/modules/extras/packaging/language/npm.py b/lib/ansible/modules/extras/packaging/language/npm.py
index 8407589116a..3eafcd6c2a7 100644
--- a/lib/ansible/modules/extras/packaging/language/npm.py
+++ b/lib/ansible/modules/extras/packaging/language/npm.py
@@ -25,7 +25,7 @@ short_description: Manage node.js packages with npm
 description:
   - Manage node.js packages with Node Package Manager (npm)
 version_added: 1.2
-author: Chris Hoffman
+author: '"Chris Hoffman (@chrishoffman)" <christopher.hoffman@gmail.com>'
 options:
   name:
     description:
diff --git a/lib/ansible/modules/extras/packaging/os/homebrew.py b/lib/ansible/modules/extras/packaging/os/homebrew.py
index 609682207d8..f6d63b17d3c 100644
--- a/lib/ansible/modules/extras/packaging/os/homebrew.py
+++ b/lib/ansible/modules/extras/packaging/os/homebrew.py
@@ -22,9 +22,9 @@
 DOCUMENTATION = '''
 ---
 module: homebrew
-author: 
-    - "Daniel Jaouen (@danieljaouen)" <dcj24@cornell.edu>
-    - "Andrew Dunham (@andrew-d)" <andrew@du.nham.ca>
+author:
+    - '"Daniel Jaouen (@danieljaouen)" <dcj24@cornell.edu>'
+    - '"Andrew Dunham (@andrew-d)" <andrew@du.nham.ca>'
 short_description: Package manager for Homebrew
 description:
     - Manages Homebrew packages
diff --git a/lib/ansible/modules/extras/packaging/os/homebrew_cask.py b/lib/ansible/modules/extras/packaging/os/homebrew_cask.py
index 75acead517b..292da6c7f59 100644
--- a/lib/ansible/modules/extras/packaging/os/homebrew_cask.py
+++ b/lib/ansible/modules/extras/packaging/os/homebrew_cask.py
@@ -19,7 +19,7 @@
 DOCUMENTATION = '''
 ---
 module: homebrew_cask
-author: Daniel Jaouen
+author: '"Daniel Jaouen (@danieljaouen)" <dcj24@cornell.edu>'
 short_description: Install/uninstall homebrew casks.
 description:
     - Manages Homebrew casks.
diff --git a/lib/ansible/modules/extras/packaging/os/homebrew_tap.py b/lib/ansible/modules/extras/packaging/os/homebrew_tap.py
index d329227b980..1e0b6b66169 100644
--- a/lib/ansible/modules/extras/packaging/os/homebrew_tap.py
+++ b/lib/ansible/modules/extras/packaging/os/homebrew_tap.py
@@ -24,7 +24,7 @@ import re
 DOCUMENTATION = '''
 ---
 module: homebrew_tap
-author: Daniel Jaouen
+author: '"Daniel Jaouen (@danieljaouen)" <dcj24@cornell.edu>'
 short_description: Tap a Homebrew repository.
 description:
     - Tap external Homebrew repositories.
diff --git a/lib/ansible/modules/extras/packaging/os/layman.py b/lib/ansible/modules/extras/packaging/os/layman.py
index b4830f8ec2c..3cad5e35642 100644
--- a/lib/ansible/modules/extras/packaging/os/layman.py
+++ b/lib/ansible/modules/extras/packaging/os/layman.py
@@ -25,7 +25,7 @@ from urllib2 import Request, urlopen, URLError
 DOCUMENTATION = '''
 ---
 module: layman
-author: Jakub Jirutka
+author: '"Jakub Jirutka (@jirutka)" <jakub@jirutka.cz>'
 version_added: "1.6"
 short_description: Manage Gentoo overlays
 description:
diff --git a/lib/ansible/modules/extras/packaging/os/openbsd_pkg.py b/lib/ansible/modules/extras/packaging/os/openbsd_pkg.py
index 14b4ff46024..2f81753fb64 100644
--- a/lib/ansible/modules/extras/packaging/os/openbsd_pkg.py
+++ b/lib/ansible/modules/extras/packaging/os/openbsd_pkg.py
@@ -25,7 +25,7 @@ import syslog
 DOCUMENTATION = '''
 ---
 module: openbsd_pkg
-author: Patrik Lundin
+author: '"Patrik Lundin (@eest)" <patrik.lundin.swe@gmail.com>'
 version_added: "1.1"
 short_description: Manage packages on OpenBSD.
 description:
diff --git a/lib/ansible/modules/extras/packaging/os/opkg.py b/lib/ansible/modules/extras/packaging/os/opkg.py
index 95afd6fd8bd..8f06a03a1b2 100644
--- a/lib/ansible/modules/extras/packaging/os/opkg.py
+++ b/lib/ansible/modules/extras/packaging/os/opkg.py
@@ -20,7 +20,7 @@
 DOCUMENTATION = '''
 ---
 module: opkg
-author: Patrick Pelletier
+author: '"Patrick Pelletier (@skinp)" <pp.pelletier@gmail.com>'
 short_description: Package manager for OpenWrt
 description:
     - Manages OpenWrt packages
diff --git a/lib/ansible/modules/extras/packaging/os/zypper.py b/lib/ansible/modules/extras/packaging/os/zypper.py
index ccf901d4fa1..c175c152050 100644
--- a/lib/ansible/modules/extras/packaging/os/zypper.py
+++ b/lib/ansible/modules/extras/packaging/os/zypper.py
@@ -31,7 +31,7 @@ import re
 DOCUMENTATION = '''
 ---
 module: zypper
-author: Patrick Callahan
+author: '"Patrick Callahan (@dirtyharrycallahan)" <pmc@patrickcallahan.com>'
 version_added: "1.2"
 short_description: Manage packages on SUSE and openSUSE
 description:
diff --git a/lib/ansible/modules/extras/packaging/os/zypper_repository.py b/lib/ansible/modules/extras/packaging/os/zypper_repository.py
index f208305fe60..3210e93d391 100644
--- a/lib/ansible/modules/extras/packaging/os/zypper_repository.py
+++ b/lib/ansible/modules/extras/packaging/os/zypper_repository.py
@@ -23,7 +23,7 @@
 DOCUMENTATION = '''
 ---
 module: zypper_repository
-author: Matthias Vogelgesang
+author: '"Matthias Vogelgesang (@matze)" <matthias.vogelgesang@gmail.com>'
 version_added: "1.4"
 short_description: Add and remove Zypper repositories
 description:
diff --git a/lib/ansible/modules/extras/source_control/github_hooks.py b/lib/ansible/modules/extras/source_control/github_hooks.py
index 7aaff98f413..bb60b634cb3 100644
--- a/lib/ansible/modules/extras/source_control/github_hooks.py
+++ b/lib/ansible/modules/extras/source_control/github_hooks.py
@@ -64,7 +64,7 @@ options:
     default: 'json'
     choices: ['json', 'form']
 
-author: Phillip Gentry, CX Inc
+author: '"Phillip Gentry, CX Inc (@pcgentry)" <phillip@cx.com>'
 '''
 
 EXAMPLES = '''
diff --git a/lib/ansible/modules/extras/system/gluster_volume.py b/lib/ansible/modules/extras/system/gluster_volume.py
index 04a75d93ce0..7b83c62297f 100644
--- a/lib/ansible/modules/extras/system/gluster_volume.py
+++ b/lib/ansible/modules/extras/system/gluster_volume.py
@@ -103,7 +103,7 @@ options:
 notes:
   - "Requires cli tools for GlusterFS on servers"
   - "Will add new bricks, but not remove them"
-author: Taneli Leppä
+author: '"Taneli Leppä (@rosmo)" <taneli@crasman.fi>'
 """
 
 EXAMPLES = """
diff --git a/lib/ansible/modules/extras/system/kernel_blacklist.py b/lib/ansible/modules/extras/system/kernel_blacklist.py
index 6af08c0788c..b0901473867 100644
--- a/lib/ansible/modules/extras/system/kernel_blacklist.py
+++ b/lib/ansible/modules/extras/system/kernel_blacklist.py
@@ -25,7 +25,7 @@ import re
 DOCUMENTATION = '''
 ---
 module: kernel_blacklist
-author: Matthias Vogelgesang
+author: '"Matthias Vogelgesang (@matze)" <matthias.vogelgesang@gmail.com>'
 version_added: 1.4
 short_description: Blacklist kernel modules
 description:
diff --git a/lib/ansible/modules/extras/system/known_hosts.py b/lib/ansible/modules/extras/system/known_hosts.py
index 86876cd4931..74c6b0e90c7 100644
--- a/lib/ansible/modules/extras/system/known_hosts.py
+++ b/lib/ansible/modules/extras/system/known_hosts.py
@@ -51,7 +51,7 @@ options:
     required: no
     default: present
 requirements: [ ]
-author: Matthew Vernon
+author: '"Matthew Vernon (@mcv21)" <mcv21@cam.ac.uk>'
 '''
 
 EXAMPLES = '''
diff --git a/lib/ansible/modules/extras/system/modprobe.py b/lib/ansible/modules/extras/system/modprobe.py
index af845ae8cf5..bf58e435552 100644
--- a/lib/ansible/modules/extras/system/modprobe.py
+++ b/lib/ansible/modules/extras/system/modprobe.py
@@ -25,7 +25,10 @@ module: modprobe
 short_description: Add or remove kernel modules
 requirements: []
 version_added: 1.4
-author: David Stygstra, Julien Dauphant, Matt Jeffery
+author:
+    - '"David Stygstra (@stygstra)" <david.stygstra@gmail.com>'
+    - Julien Dauphant
+    - Matt Jeffery
 description:
     - Add or remove kernel modules.
 options:
diff --git a/lib/ansible/modules/extras/system/open_iscsi.py b/lib/ansible/modules/extras/system/open_iscsi.py
index c661a723d77..97652311f8d 100644
--- a/lib/ansible/modules/extras/system/open_iscsi.py
+++ b/lib/ansible/modules/extras/system/open_iscsi.py
@@ -21,7 +21,7 @@
 DOCUMENTATION = '''
 ---
 module: open_iscsi
-author: Serge van Ginderachter
+author: '"Serge van Ginderachter (@srvg)" <serge@vanginderachter.be>'
 version_added: "1.4"
 short_description: Manage iscsi targets with open-iscsi
 description:
diff --git a/lib/ansible/modules/extras/web_infrastructure/jboss.py b/lib/ansible/modules/extras/web_infrastructure/jboss.py
index 65b44d23047..a0949c47531 100644
--- a/lib/ansible/modules/extras/web_infrastructure/jboss.py
+++ b/lib/ansible/modules/extras/web_infrastructure/jboss.py
@@ -47,7 +47,7 @@ options:
 notes:
   - "The JBoss standalone deployment-scanner has to be enabled in standalone.xml"
   - "Ensure no identically named application is deployed through the JBoss CLI"
-author: Jeroen Hoekx
+author: '"Jeroen Hoekx (@jhoekx)" <jeroen.hoekx@dsquare.be>'
 """
 
 EXAMPLES = """
diff --git a/lib/ansible/modules/extras/web_infrastructure/jira.py b/lib/ansible/modules/extras/web_infrastructure/jira.py
index 437a21b6769..3dc963cb6bd 100644
--- a/lib/ansible/modules/extras/web_infrastructure/jira.py
+++ b/lib/ansible/modules/extras/web_infrastructure/jira.py
@@ -99,7 +99,7 @@ options:
 notes:
   - "Currently this only works with basic-auth."
 
-author: Steve Smith
+author: '"Steve Smith (@tarka)" <ssmith@atlassian.com>'
 """
 
 EXAMPLES = """