diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_account.py b/lib/ansible/modules/extras/cloud/cloudstack/cs_account.py
index cd6a1228807..ccb29e1015f 100644
--- a/lib/ansible/modules/extras/cloud/cloudstack/cs_account.py
+++ b/lib/ansible/modules/extras/cloud/cloudstack/cs_account.py
@@ -25,7 +25,7 @@ short_description: Manages account on Apache CloudStack based clouds.
 description:
     - Create, disable, lock, enable and remove accounts.
 version_added: '2.0'
-author: René Moser
+author: '"René Moser (@resmo)" <mail@renemoser.net>'
 options:
   name:
     description:
diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_affinitygroup.py b/lib/ansible/modules/extras/cloud/cloudstack/cs_affinitygroup.py
index d9f6f77c485..2bffe3ddc16 100644
--- a/lib/ansible/modules/extras/cloud/cloudstack/cs_affinitygroup.py
+++ b/lib/ansible/modules/extras/cloud/cloudstack/cs_affinitygroup.py
@@ -24,7 +24,7 @@ module: cs_affinitygroup
 short_description: Manages affinity groups on Apache CloudStack based clouds.
 description: Create and remove affinity groups.
 version_added: '2.0'
-author: René Moser
+author: '"René Moser (@resmo)" <mail@renemoser.net>'
 options:
   name:
     description:
diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_firewall.py b/lib/ansible/modules/extras/cloud/cloudstack/cs_firewall.py
index ee5fc37b5d1..64bc9fd6654 100644
--- a/lib/ansible/modules/extras/cloud/cloudstack/cs_firewall.py
+++ b/lib/ansible/modules/extras/cloud/cloudstack/cs_firewall.py
@@ -24,7 +24,7 @@ module: cs_firewall
 short_description: Manages firewall rules on Apache CloudStack based clouds.
 description: Creates and removes firewall rules.
 version_added: '2.0'
-author: René Moser
+author: '"René Moser (@resmo)" <mail@renemoser.net>'
 options:
   ip_address:
     description:
diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_instance.py b/lib/ansible/modules/extras/cloud/cloudstack/cs_instance.py
index a9a3127d347..2363c57e8df 100644
--- a/lib/ansible/modules/extras/cloud/cloudstack/cs_instance.py
+++ b/lib/ansible/modules/extras/cloud/cloudstack/cs_instance.py
@@ -25,7 +25,7 @@ short_description: Manages instances and virtual machines on Apache CloudStack b
 description:
     - Deploy, start, restart, stop and destroy instances on Apache CloudStack, Citrix CloudPlatform and Exoscale.
 version_added: '2.0'
-author: "René Moser (@resmo)" <mail@renemoser.net>
+author: '"René Moser (@resmo)" <mail@renemoser.net>'
 options:
   name:
     description:
diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_instancegroup.py b/lib/ansible/modules/extras/cloud/cloudstack/cs_instancegroup.py
index 2c47a9f6f25..71aa4bfa38b 100644
--- a/lib/ansible/modules/extras/cloud/cloudstack/cs_instancegroup.py
+++ b/lib/ansible/modules/extras/cloud/cloudstack/cs_instancegroup.py
@@ -25,7 +25,7 @@ short_description: Manages instance groups on Apache CloudStack based clouds.
 description:
     - Create and remove instance groups.
 version_added: '2.0'
-author: René Moser
+author: '"René Moser (@resmo)" <mail@renemoser.net>'
 options:
   name:
     description:
diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_iso.py b/lib/ansible/modules/extras/cloud/cloudstack/cs_iso.py
index 1b1cd28fe4c..6c94aa1366d 100644
--- a/lib/ansible/modules/extras/cloud/cloudstack/cs_iso.py
+++ b/lib/ansible/modules/extras/cloud/cloudstack/cs_iso.py
@@ -24,7 +24,7 @@ module: cs_iso
 short_description: Manages ISOs images on Apache CloudStack based clouds.
 description: Register and remove ISO images.
 version_added: '2.0'
-author: René Moser
+author: '"René Moser (@resmo)" <mail@renemoser.net>'
 options:
   name:
     description:
diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_portforward.py b/lib/ansible/modules/extras/cloud/cloudstack/cs_portforward.py
index 6c9cbd7e76a..60f1de86c70 100644
--- a/lib/ansible/modules/extras/cloud/cloudstack/cs_portforward.py
+++ b/lib/ansible/modules/extras/cloud/cloudstack/cs_portforward.py
@@ -25,7 +25,7 @@ short_description: Manages port forwarding rules on Apache CloudStack based clou
 description:
     - Create, update and remove port forwarding rules.
 version_added: '2.0'
-author: René Moser
+author: '"René Moser (@resmo)" <mail@renemoser.net>'
 options:
   ip_address:
     description:
diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_securitygroup.py b/lib/ansible/modules/extras/cloud/cloudstack/cs_securitygroup.py
index b3bc74fd7d6..4f57e375f0b 100644
--- a/lib/ansible/modules/extras/cloud/cloudstack/cs_securitygroup.py
+++ b/lib/ansible/modules/extras/cloud/cloudstack/cs_securitygroup.py
@@ -23,7 +23,7 @@ module: cs_securitygroup
 short_description: Manages security groups on Apache CloudStack based clouds.
 description: Create and remove security groups.
 version_added: '2.0'
-author: "René Moser (@resmo)" <mail@renemoser.net>
+author: '"René Moser (@resmo)" <mail@renemoser.net>'
 options:
   name:
     description:
diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_securitygroup_rule.py b/lib/ansible/modules/extras/cloud/cloudstack/cs_securitygroup_rule.py
index cd05440c4b1..2216812f28a 100644
--- a/lib/ansible/modules/extras/cloud/cloudstack/cs_securitygroup_rule.py
+++ b/lib/ansible/modules/extras/cloud/cloudstack/cs_securitygroup_rule.py
@@ -24,7 +24,7 @@ module: cs_securitygroup_rule
 short_description: Manages security group rules on Apache CloudStack based clouds.
 description: Add and remove security group rules.
 version_added: '2.0'
-author: René Moser
+author: '"René Moser (@resmo)" <mail@renemoser.net>'
 options:
   security_group:
     description:
diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_sshkeypair.py b/lib/ansible/modules/extras/cloud/cloudstack/cs_sshkeypair.py
index 1f1aa2c1fdd..f24faee41d6 100644
--- a/lib/ansible/modules/extras/cloud/cloudstack/cs_sshkeypair.py
+++ b/lib/ansible/modules/extras/cloud/cloudstack/cs_sshkeypair.py
@@ -27,7 +27,7 @@ description:
     - If no key was found and no public key was provided and a new SSH
       private/public key pair will be created and the private key will be returned.
 version_added: '2.0'
-author: René Moser
+author: '"René Moser (@resmo)" <mail@renemoser.net>'
 options:
   name:
     description:
diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_vmsnapshot.py b/lib/ansible/modules/extras/cloud/cloudstack/cs_vmsnapshot.py
index f4bef812123..ad0c2cf3884 100644
--- a/lib/ansible/modules/extras/cloud/cloudstack/cs_vmsnapshot.py
+++ b/lib/ansible/modules/extras/cloud/cloudstack/cs_vmsnapshot.py
@@ -24,7 +24,7 @@ module: cs_vmsnapshot
 short_description: Manages VM snapshots on Apache CloudStack based clouds.
 description: Create, remove and revert VM from snapshots.
 version_added: '2.0'
-author: René Moser
+author: '"René Moser (@resmo)" <mail@renemoser.net>'
 options:
   name:
     description:
diff --git a/lib/ansible/modules/extras/cloud/google/gce_img.py b/lib/ansible/modules/extras/cloud/google/gce_img.py
index ae4c31dc4c5..9cc37f8eb33 100644
--- a/lib/ansible/modules/extras/cloud/google/gce_img.py
+++ b/lib/ansible/modules/extras/cloud/google/gce_img.py
@@ -81,7 +81,7 @@ options:
 requirements:
     - "python >= 2.6"
     - "apache-libcloud"
-author: Peter Tan <ptan@google.com>
+author: '"Peter Tan (@tanpeter)" <ptan@google.com>'
 '''
 
 EXAMPLES = '''
diff --git a/lib/ansible/modules/extras/cloud/lxc/lxc_container.py b/lib/ansible/modules/extras/cloud/lxc/lxc_container.py
index 863ddb846d5..119d45069c3 100644
--- a/lib/ansible/modules/extras/cloud/lxc/lxc_container.py
+++ b/lib/ansible/modules/extras/cloud/lxc/lxc_container.py
@@ -26,7 +26,7 @@ short_description: Manage LXC Containers
 version_added: 1.8.0
 description:
   - Management of LXC containers
-author: Kevin Carter
+author: '"Kevin Carter (@cloudnull)" <kevin.carter@rackspace.com>'
 options:
     name:
         description:
diff --git a/lib/ansible/modules/extras/clustering/consul.py b/lib/ansible/modules/extras/clustering/consul.py
index 27761094698..9195c0ff591 100644
--- a/lib/ansible/modules/extras/clustering/consul.py
+++ b/lib/ansible/modules/extras/clustering/consul.py
@@ -42,7 +42,7 @@ requirements:
   - python-consul
   - requests
 version_added: "1.9"
-author: Steve Gargan (steve.gargan@gmail.com)
+author: '"Steve Gargan (@sgargan)" <steve.gargan@gmail.com>'
 options:
     state:
         description:
diff --git a/lib/ansible/modules/extras/clustering/consul_acl.py b/lib/ansible/modules/extras/clustering/consul_acl.py
index 57ff795931f..31cb01d1404 100644
--- a/lib/ansible/modules/extras/clustering/consul_acl.py
+++ b/lib/ansible/modules/extras/clustering/consul_acl.py
@@ -30,7 +30,7 @@ requirements:
   - pyhcl
   - requests
 version_added: "1.9"
-author: Steve Gargan (steve.gargan@gmail.com)
+author: '"Steve Gargan (@sgargan)" <steve.gargan@gmail.com>'
 options:
     mgmt_token:
         description:
diff --git a/lib/ansible/modules/extras/clustering/consul_kv.py b/lib/ansible/modules/extras/clustering/consul_kv.py
index 02d06868946..13437d95cce 100644
--- a/lib/ansible/modules/extras/clustering/consul_kv.py
+++ b/lib/ansible/modules/extras/clustering/consul_kv.py
@@ -32,7 +32,7 @@ requirements:
   - python-consul
   - requests
 version_added: "1.9"
-author: Steve Gargan (steve.gargan@gmail.com)
+author: '"Steve Gargan (@sgargan)" <steve.gargan@gmail.com>'
 options:
     state:
         description:
diff --git a/lib/ansible/modules/extras/clustering/consul_session.py b/lib/ansible/modules/extras/clustering/consul_session.py
index 6f3a611a642..8e7f763a21d 100644
--- a/lib/ansible/modules/extras/clustering/consul_session.py
+++ b/lib/ansible/modules/extras/clustering/consul_session.py
@@ -30,7 +30,7 @@ requirements:
   - python-consul
   - requests
 version_added: "1.9"
-author: Steve Gargan (steve.gargan@gmail.com)
+author: '"Steve Gargan (@sgargan)" <steve.gargan@gmail.com>'
 options:
     state:
         description:
diff --git a/lib/ansible/modules/extras/database/misc/mongodb_user.py b/lib/ansible/modules/extras/database/misc/mongodb_user.py
index 3a3cf4dfff1..83a3395216e 100644
--- a/lib/ansible/modules/extras/database/misc/mongodb_user.py
+++ b/lib/ansible/modules/extras/database/misc/mongodb_user.py
@@ -91,7 +91,7 @@ notes:
     - Requires the pymongo Python package on the remote host, version 2.4.2+. This
       can be installed using pip or the OS package manager. @see http://api.mongodb.org/python/current/installation.html
 requirements: [ "pymongo" ]
-author: Elliott Foster
+author: '"Elliott Foster (@elliotttf)" <elliott@fourkitchens.com>'
 '''
 
 EXAMPLES = '''
diff --git a/lib/ansible/modules/extras/database/mysql/mysql_replication.py b/lib/ansible/modules/extras/database/mysql/mysql_replication.py
index 1a722e99cd6..ffa29015d33 100644
--- a/lib/ansible/modules/extras/database/mysql/mysql_replication.py
+++ b/lib/ansible/modules/extras/database/mysql/mysql_replication.py
@@ -30,7 +30,7 @@ short_description: Manage MySQL replication
 description:
     - Manages MySQL server replication, slave, master status get and change master host.
 version_added: "1.3"
-author: "Balazs Pocze (@banyek)" <banyek@gawker.com>
+author: '"Balazs Pocze (@banyek)" <banyek@gawker.com>'
 options:
     mode:
         description:
diff --git a/lib/ansible/modules/extras/monitoring/airbrake_deployment.py b/lib/ansible/modules/extras/monitoring/airbrake_deployment.py
index e1c490b881b..0036bde7daa 100644
--- a/lib/ansible/modules/extras/monitoring/airbrake_deployment.py
+++ b/lib/ansible/modules/extras/monitoring/airbrake_deployment.py
@@ -22,7 +22,7 @@ DOCUMENTATION = '''
 ---
 module: airbrake_deployment
 version_added: "1.2"
-author: Bruce Pennypacker
+author: '"Bruce Pennypacker (@bpennypacker)" <bruce@pennypacker.org>'
 short_description: Notify airbrake about app deployments
 description:
    - Notify airbrake about app deployments (see http://help.airbrake.io/kb/api-2/deploy-tracking)
diff --git a/lib/ansible/modules/extras/monitoring/boundary_meter.py b/lib/ansible/modules/extras/monitoring/boundary_meter.py
index f6d84328597..adc2b2433e1 100644
--- a/lib/ansible/modules/extras/monitoring/boundary_meter.py
+++ b/lib/ansible/modules/extras/monitoring/boundary_meter.py
@@ -34,7 +34,7 @@ short_description: Manage boundary meters
 description:
     - This module manages boundary meters
 version_added: "1.3"
-author: curtis@serverascode.com
+author: '"curtis (@ccollicutt)" <curtis@serverascode.com>'
 requirements:
     - Boundary API access
     - bprobe is required to send data, but not to register a meter
diff --git a/lib/ansible/modules/extras/monitoring/datadog_event.py b/lib/ansible/modules/extras/monitoring/datadog_event.py
index 5d38dd4c31d..1d6a98dc9c3 100644
--- a/lib/ansible/modules/extras/monitoring/datadog_event.py
+++ b/lib/ansible/modules/extras/monitoring/datadog_event.py
@@ -14,7 +14,7 @@ description:
 - "Allows to post events to DataDog (www.datadoghq.com) service."
 - "Uses http://docs.datadoghq.com/api/#events API."
 version_added: "1.3"
-author: Artūras 'arturaz' Šlajus <x11@arturaz.net>
+author: '"Artūras `arturaz` Šlajus (@arturaz)" <x11@arturaz.net>'
 notes: []
 requirements: [urllib2]
 options:
diff --git a/lib/ansible/modules/extras/monitoring/logentries.py b/lib/ansible/modules/extras/monitoring/logentries.py
index a19885ea702..75ed2e0e6dd 100644
--- a/lib/ansible/modules/extras/monitoring/logentries.py
+++ b/lib/ansible/modules/extras/monitoring/logentries.py
@@ -19,8 +19,8 @@
 DOCUMENTATION = '''
 ---
 module: logentries
-author: Ivan Vanderbyl
-short_description: Module for tracking logs via logentries.com 
+author: '"Ivan Vanderbyl (@ivanvanderbyl)" <ivan@app.io>'
+short_description: Module for tracking logs via logentries.com
 description:
     - Sends logs to LogEntries in realtime
 version_added: "1.6"
diff --git a/lib/ansible/modules/extras/monitoring/monit.py b/lib/ansible/modules/extras/monitoring/monit.py
index 52e56bfc44e..e87d8edca5a 100644
--- a/lib/ansible/modules/extras/monitoring/monit.py
+++ b/lib/ansible/modules/extras/monitoring/monit.py
@@ -39,7 +39,7 @@ options:
     default: null
     choices: [ "present", "started", "stopped", "restarted", "monitored", "unmonitored", "reloaded" ]
 requirements: [ ]
-author: "Darryl Stoflet (@dstoflet)" <stoflet@gmail.com>
+author: '"Darryl Stoflet (@dstoflet)" <stoflet@gmail.com>'
 '''
 
 EXAMPLES = '''