diff --git a/lib/ansible/modules/extras/REVIEWERS.md b/lib/ansible/modules/extras/REVIEWERS.md
index 985afce7bea..5ae08b59b02 100644
--- a/lib/ansible/modules/extras/REVIEWERS.md
+++ b/lib/ansible/modules/extras/REVIEWERS.md
@@ -120,7 +120,7 @@ Active
 "Raul Melo (@melodous)" 
 "Ravi Bhure (@ravibhure)"
 "René Moser (@resmo)"
-"Richard Hoop (@rhoop) <wrhoop@gmail.com>"
+"Richard Hoop (@rhoop)"
 "Richard Isaacson (@risaacson)" 
 "Rick Mendes (@rickmendes)"
 "Romeo Theriault (@romeotheriault)"
@@ -129,7 +129,7 @@ Active
 "Serge van Ginderachter (@srvg)"
 "Sergei Antipov (@UnderGreen)"
 "Seth Edwards (@sedward)" 
-"Silviu Dicu (@silviud) <silviudicu@gmail.com>"
+"Silviu Dicu (@silviud)"
 "Simon JAILLET (@jails)"
 "Stephen Fromm (@sfromm)"
 "Steve (@groks)"
diff --git a/lib/ansible/modules/extras/cloud/amazon/ec2_eni_facts.py b/lib/ansible/modules/extras/cloud/amazon/ec2_eni_facts.py
index 94b586fb639..76347c84261 100644
--- a/lib/ansible/modules/extras/cloud/amazon/ec2_eni_facts.py
+++ b/lib/ansible/modules/extras/cloud/amazon/ec2_eni_facts.py
@@ -20,7 +20,7 @@ short_description: Gather facts about ec2 ENI interfaces in AWS
 description:
     - Gather facts about ec2 ENI interfaces in AWS
 version_added: "2.0"
-author: Rob White, wimnat [at] gmail.com, @wimnat
+author: "Rob White (@wimnat)"
 options:
   eni_id:
     description:
diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_account.py b/lib/ansible/modules/extras/cloud/cloudstack/cs_account.py
index 597e4c7394e..cc487af5e51 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 (@resmo)" <mail@renemoser.net>'
+author: "René Moser (@resmo)"
 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 11e8f2824e9..2052300ff05 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 (@resmo)" <mail@renemoser.net>'
+author: "René Moser (@resmo)"
 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 3c15c1265bf..211b6c04e9a 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 (@resmo)" <mail@renemoser.net>'
+author: "René Moser (@resmo)"
 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 941cbd43718..2cab6fa8d23 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.
 version_added: '2.0'
-author: '"René Moser (@resmo)" <mail@renemoser.net>'
+author: "René Moser (@resmo)"
 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 396cafa388d..478748aeec3 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 (@resmo)" <mail@renemoser.net>'
+author: "René Moser (@resmo)"
 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 48aaf9b97ac..f907c0d1939 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 (@resmo)" <mail@renemoser.net>'
+author: "René Moser (@resmo)"
 options:
   name:
     description:
diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_network.py b/lib/ansible/modules/extras/cloud/cloudstack/cs_network.py
index e22eaf0a5c3..b602b345677 100644
--- a/lib/ansible/modules/extras/cloud/cloudstack/cs_network.py
+++ b/lib/ansible/modules/extras/cloud/cloudstack/cs_network.py
@@ -25,7 +25,7 @@ short_description: Manages networks on Apache CloudStack based clouds.
 description:
     - Create, update, restart and delete networks.
 version_added: '2.0'
-author: '"René Moser (@resmo)" <mail@renemoser.net>'
+author: "René Moser (@resmo)"
 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 98043165eb3..8606f6329d3 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 (@resmo)" <mail@renemoser.net>'
+author: "René Moser (@resmo)"
 options:
   ip_address:
     description:
diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_project.py b/lib/ansible/modules/extras/cloud/cloudstack/cs_project.py
index b505433892e..0f391bc5005 100644
--- a/lib/ansible/modules/extras/cloud/cloudstack/cs_project.py
+++ b/lib/ansible/modules/extras/cloud/cloudstack/cs_project.py
@@ -25,7 +25,7 @@ short_description: Manages projects on Apache CloudStack based clouds.
 description:
     - Create, update, suspend, activate and remove projects.
 version_added: '2.0'
-author: '"René Moser (@resmo)" <mail@renemoser.net>'
+author: "René Moser (@resmo)"
 options:
   name:
     description:
diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_securitygroup.py b/lib/ansible/modules/extras/cloud/cloudstack/cs_securitygroup.py
index 457a8011ea1..c9a72c15d58 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)"
 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 b5ddbb489e2..a62447ff6cb 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 (@resmo)" <mail@renemoser.net>'
+author: "René Moser (@resmo)"
 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 0a54a1971bc..180e96ca6ae 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 (@resmo)" <mail@renemoser.net>'
+author: "René Moser (@resmo)"
 options:
   name:
     description:
diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_template.py b/lib/ansible/modules/extras/cloud/cloudstack/cs_template.py
index 48f00fad553..1cd245d2b5c 100644
--- a/lib/ansible/modules/extras/cloud/cloudstack/cs_template.py
+++ b/lib/ansible/modules/extras/cloud/cloudstack/cs_template.py
@@ -25,7 +25,7 @@ short_description: Manages templates on Apache CloudStack based clouds.
 description:
   - Register a template from URL, create a template from a ROOT volume of a stopped VM or its snapshot and delete templates.
 version_added: '2.0'
-author: '"René Moser (@resmo)" <mail@renemoser.net>'
+author: "René Moser (@resmo)"
 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 213b8aebc64..c487dd0b4c7 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 (@resmo)" <mail@renemoser.net>'
+author: "René Moser (@resmo)"
 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 9cc37f8eb33..5775a94794d 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 (@tanpeter)" <ptan@google.com>'
+author: "Peter Tan (@tanpeter)"
 '''
 
 EXAMPLES = '''
diff --git a/lib/ansible/modules/extras/cloud/lxc/lxc_container.py b/lib/ansible/modules/extras/cloud/lxc/lxc_container.py
index 18555e2e351..711c70bca98 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 (@cloudnull)" <kevin.carter@rackspace.com>'
+author: "Kevin Carter (@cloudnull)"
 options:
     name:
         description:
diff --git a/lib/ansible/modules/extras/cloud/misc/ovirt.py b/lib/ansible/modules/extras/cloud/misc/ovirt.py
index 718f25fec2c..6e8f3281dc5 100644
--- 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 (@vincentvdk)" <vincent at vanderkussen.org>'
+author: "Vincent Van der Kussen (@vincentvdk)"
 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/cloud/misc/virt.py b/lib/ansible/modules/extras/cloud/misc/virt.py
index 343a3eedcf7..80b8e2558eb 100644
--- a/lib/ansible/modules/extras/cloud/misc/virt.py
+++ b/lib/ansible/modules/extras/cloud/misc/virt.py
@@ -60,8 +60,8 @@ requirements:
     - "libvirt-python"
 author:
     - "Ansible Core Team"
-    - '"Michael DeHaan (@mpdehaan)" <michael.dehaan@gmail.com>'
-    - '"Seth Vidal (@skvidal)" <skvidal@fedoraproject.org>'
+    - "Michael DeHaan"
+    - "Seth Vidal"
 '''
 
 EXAMPLES = '''
diff --git a/lib/ansible/modules/extras/cloud/vmware/vmware_datacenter.py b/lib/ansible/modules/extras/cloud/vmware/vmware_datacenter.py
index b1e995b965b..b2083222ed5 100644
--- a/lib/ansible/modules/extras/cloud/vmware/vmware_datacenter.py
+++ b/lib/ansible/modules/extras/cloud/vmware/vmware_datacenter.py
@@ -25,7 +25,7 @@ short_description: Manage VMware vSphere Datacenters
 description:
     - Manage VMware vSphere Datacenters
 version_added: 2.0
-author: '"Joseph Callen (@jcpowermac)" <jcallen () csc.com>'
+author: "Joseph Callen (@jcpowermac)"
 notes:
     - Tested on vSphere 5.5
 requirements:
diff --git a/lib/ansible/modules/extras/clustering/consul.py b/lib/ansible/modules/extras/clustering/consul.py
index 8423ffe418f..083173230f7 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: "2.0"
-author: '"Steve Gargan (@sgargan)" <steve.gargan@gmail.com>'
+author: "Steve Gargan (@sgargan)" 
 options:
     state:
         description:
diff --git a/lib/ansible/modules/extras/clustering/consul_acl.py b/lib/ansible/modules/extras/clustering/consul_acl.py
index b832281bb80..250de24e2a3 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: "2.0"
-author: '"Steve Gargan (@sgargan)" <steve.gargan@gmail.com>'
+author: "Steve Gargan (@sgargan)"
 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 69a66c746ab..2ba3a0315a3 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: "2.0"
-author: '"Steve Gargan (@sgargan)" <steve.gargan@gmail.com>'
+author: "Steve Gargan (@sgargan)"
 options:
     state:
         description:
diff --git a/lib/ansible/modules/extras/clustering/consul_session.py b/lib/ansible/modules/extras/clustering/consul_session.py
index d57c2b69db8..ef4646c35e4 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: "2.0"
-author: '"Steve Gargan (@sgargan)" <steve.gargan@gmail.com>'
+author: "Steve Gargan (@sgargan)"
 options:
     state:
         description:
diff --git a/lib/ansible/modules/extras/commands/expect.py b/lib/ansible/modules/extras/commands/expect.py
index 124c718b73b..e8f7a049836 100644
--- a/lib/ansible/modules/extras/commands/expect.py
+++ b/lib/ansible/modules/extras/commands/expect.py
@@ -73,7 +73,7 @@ notes:
   - If you want to run a command through the shell (say you are using C(<),
     C(>), C(|), etc), you must specify a shell in the command such as
     C(/bin/bash -c "/path/to/something | grep else")
-author: '"Matt Martz (@sivel)" <matt@sivel.net>'
+author: "Matt Martz (@sivel)"
 '''
 
 EXAMPLES = '''
diff --git a/lib/ansible/modules/extras/database/misc/mongodb_user.py b/lib/ansible/modules/extras/database/misc/mongodb_user.py
index 9802f890a35..ede8004945b 100644
--- a/lib/ansible/modules/extras/database/misc/mongodb_user.py
+++ b/lib/ansible/modules/extras/database/misc/mongodb_user.py
@@ -99,7 +99,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 (@elliotttf)" <elliott@fourkitchens.com>'
+author: "Elliott Foster (@elliotttf)"
 '''
 
 EXAMPLES = '''
diff --git a/lib/ansible/modules/extras/database/misc/riak.py b/lib/ansible/modules/extras/database/misc/riak.py
index 4f10775a5ad..12586651887 100644
--- a/lib/ansible/modules/extras/database/misc/riak.py
+++ b/lib/ansible/modules/extras/database/misc/riak.py
@@ -27,8 +27,8 @@ description:
        the status of the cluster.
 version_added: "1.2"
 author:
-    - '"James Martin (@jsmartin)" <jmartin@ansible.com>'
-    - '"Drew Kerrigan (@drewkerrigan)" <dkerrigan@basho.com>'
+    - "James Martin (@jsmartin)"
+    - "Drew Kerrigan (@drewkerrigan)"
 options:
   command:
     description:
diff --git a/lib/ansible/modules/extras/database/mysql/mysql_replication.py b/lib/ansible/modules/extras/database/mysql/mysql_replication.py
index ffa29015d33..f3c02388684 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)" 
 options:
     mode:
         description:
diff --git a/lib/ansible/modules/extras/files/patch.py b/lib/ansible/modules/extras/files/patch.py
index c1a61ce733f..60629c922e9 100644
--- a/lib/ansible/modules/extras/files/patch.py
+++ b/lib/ansible/modules/extras/files/patch.py
@@ -23,8 +23,8 @@ DOCUMENTATION = '''
 ---
 module: patch
 author:
-    - '"Jakub Jirutka (@jirutka)" <jakub@jirutka.cz>'
-    - '"Luis Alberto Perez Lazaro (@luisperlaz)" <luisperlazaro@gmail.com>'
+    - "Jakub Jirutka (@jirutka)"
+    - "Luis Alberto Perez Lazaro (@luisperlaz)"
 version_added: 1.9
 description:
     - Apply patch files using the GNU patch tool.
diff --git a/lib/ansible/modules/extras/messaging/rabbitmq_binding.py b/lib/ansible/modules/extras/messaging/rabbitmq_binding.py
index b0ae3a38bf7..fc69f490fad 100644
--- a/lib/ansible/modules/extras/messaging/rabbitmq_binding.py
+++ b/lib/ansible/modules/extras/messaging/rabbitmq_binding.py
@@ -22,7 +22,7 @@
 DOCUMENTATION = '''
 ---
 module: rabbitmq_binding
-author: '"Manuel Sousa (@manuel-sousa)" <manuel.sousa@gmail.com>'
+author: "Manuel Sousa (@manuel-sousa)"
 version_added: "2.0"
 
 short_description: This module manages rabbitMQ bindings
diff --git a/lib/ansible/modules/extras/messaging/rabbitmq_exchange.py b/lib/ansible/modules/extras/messaging/rabbitmq_exchange.py
index 7c0c338a215..53c7c675e9d 100644
--- a/lib/ansible/modules/extras/messaging/rabbitmq_exchange.py
+++ b/lib/ansible/modules/extras/messaging/rabbitmq_exchange.py
@@ -2,7 +2,7 @@
 
 DOCUMENTATION = '''
 module: rabbitmq_exchange
-author: '"Manuel Sousa (@manuel-sousa)" <manuel.sousa@gmail.com>'
+author: "Manuel Sousa (@manuel-sousa)"
 version_added: "2.0"
 
 short_description: This module manages rabbitMQ exchanges
diff --git a/lib/ansible/modules/extras/messaging/rabbitmq_policy.py b/lib/ansible/modules/extras/messaging/rabbitmq_policy.py
index a4d94decbd1..81d7068ec46 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 (@retr0h)" <john@dewey.ws>'
+author: "John Dewey (@retr0h)"
 options:
   name:
     description:
diff --git a/lib/ansible/modules/extras/messaging/rabbitmq_queue.py b/lib/ansible/modules/extras/messaging/rabbitmq_queue.py
index 38430910592..983b2c452a6 100644
--- a/lib/ansible/modules/extras/messaging/rabbitmq_queue.py
+++ b/lib/ansible/modules/extras/messaging/rabbitmq_queue.py
@@ -2,7 +2,7 @@
 
 DOCUMENTATION = '''
 module: rabbitmq_queue
-author: '"Manuel Sousa (@manuel-sousa)" <manuel.sousa@gmail.com>'
+author: "Manuel Sousa (@manuel-sousa)" 
 version_added: "2.0"
 
 short_description: This module manages rabbitMQ queues
diff --git a/lib/ansible/modules/extras/monitoring/airbrake_deployment.py b/lib/ansible/modules/extras/monitoring/airbrake_deployment.py
index 0036bde7daa..3b54e55e751 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 (@bpennypacker)" <bruce@pennypacker.org>'
+author: "Bruce Pennypacker (@bpennypacker)"
 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 adc2b2433e1..431a6ace1b9 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 (@ccollicutt)" <curtis@serverascode.com>'
+author: "curtis (@ccollicutt)"
 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 d363f8b17dc..ebbad039dec 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 (@arturaz)" <x11@arturaz.net>'
+author: "Artūras `arturaz` Šlajus (@arturaz)"
 notes: []
 requirements: [urllib2]
 options:
diff --git a/lib/ansible/modules/extras/monitoring/datadog_monitor.py b/lib/ansible/modules/extras/monitoring/datadog_monitor.py
index f1acb169ce0..9853d748c2c 100644
--- a/lib/ansible/modules/extras/monitoring/datadog_monitor.py
+++ b/lib/ansible/modules/extras/monitoring/datadog_monitor.py
@@ -34,7 +34,7 @@ description:
 - "Manages monitors within Datadog"
 - "Options like described on http://docs.datadoghq.com/api/"
 version_added: "2.0"
-author: '"Sebastian Kornehl (@skornehl)" <sebastian.kornehl@asideas.de>'
+author: "Sebastian Kornehl (@skornehl)" 
 notes: []
 requirements: [datadog]
 options:
diff --git a/lib/ansible/modules/extras/monitoring/logentries.py b/lib/ansible/modules/extras/monitoring/logentries.py
index 75ed2e0e6dd..a347afd84c2 100644
--- a/lib/ansible/modules/extras/monitoring/logentries.py
+++ b/lib/ansible/modules/extras/monitoring/logentries.py
@@ -19,7 +19,7 @@
 DOCUMENTATION = '''
 ---
 module: logentries
-author: '"Ivan Vanderbyl (@ivanvanderbyl)" <ivan@app.io>'
+author: "Ivan Vanderbyl (@ivanvanderbyl)"
 short_description: Module for tracking logs via logentries.com
 description:
     - Sends logs to LogEntries in realtime
diff --git a/lib/ansible/modules/extras/monitoring/monit.py b/lib/ansible/modules/extras/monitoring/monit.py
index 6410ce815e8..3d3c7c8c3ca 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)" 
 '''
 
 EXAMPLES = '''
diff --git a/lib/ansible/modules/extras/monitoring/nagios.py b/lib/ansible/modules/extras/monitoring/nagios.py
index 69bcb0e6d9e..a61b63a85c6 100644
--- a/lib/ansible/modules/extras/monitoring/nagios.py
+++ b/lib/ansible/modules/extras/monitoring/nagios.py
@@ -85,7 +85,7 @@ options:
     required: true
     default: null
 
-author: '"Tim Bielawa (@tbielawa)" <tbielawa@redhat.com>'
+author: "Tim Bielawa (@tbielawa)" 
 requirements: [ "Nagios" ]
 '''
 
diff --git a/lib/ansible/modules/extras/monitoring/newrelic_deployment.py b/lib/ansible/modules/extras/monitoring/newrelic_deployment.py
index 166cdcda0be..832e467dea0 100644
--- a/lib/ansible/modules/extras/monitoring/newrelic_deployment.py
+++ b/lib/ansible/modules/extras/monitoring/newrelic_deployment.py
@@ -22,7 +22,7 @@ DOCUMENTATION = '''
 ---
 module: newrelic_deployment
 version_added: "1.2"
-author: '"Matt Coddington (@mcodd)" <coddington@gmail.com>'
+author: "Matt Coddington (@mcodd)"
 short_description: Notify newrelic about app deployments
 description:
    - Notify newrelic about app deployments (see https://docs.newrelic.com/docs/apm/new-relic-apm/maintenance/deployment-notifications#api)
diff --git a/lib/ansible/modules/extras/monitoring/rollbar_deployment.py b/lib/ansible/modules/extras/monitoring/rollbar_deployment.py
index dc064d6194d..43e2aa00722 100644
--- a/lib/ansible/modules/extras/monitoring/rollbar_deployment.py
+++ b/lib/ansible/modules/extras/monitoring/rollbar_deployment.py
@@ -22,7 +22,7 @@ DOCUMENTATION = '''
 ---
 module: rollbar_deployment
 version_added: 1.6
-author: '"Max Riveiro (@kavu)" <kavu13@gmail.com>'
+author: "Max Riveiro (@kavu)"
 short_description: Notify Rollbar about app deployments
 description:
   - Notify Rollbar about app deployments
diff --git a/lib/ansible/modules/extras/monitoring/zabbix_maintenance.py b/lib/ansible/modules/extras/monitoring/zabbix_maintenance.py
index 25d7c8df95e..2d611382919 100644
--- a/lib/ansible/modules/extras/monitoring/zabbix_maintenance.py
+++ b/lib/ansible/modules/extras/monitoring/zabbix_maintenance.py
@@ -26,7 +26,7 @@ short_description: Create Zabbix maintenance windows
 description:
     - This module will let you create Zabbix maintenance windows.
 version_added: "1.8"
-author: '"Alexander Bulimov (@abulimov)" <lazywolf0@gmail.com>'
+author: "Alexander Bulimov (@abulimov)"
 requirements:
     - "python >= 2.6"
     - zabbix-api
diff --git a/lib/ansible/modules/extras/network/a10/a10_server.py b/lib/ansible/modules/extras/network/a10/a10_server.py
index 72ed0f648e6..2ad66c23588 100644
--- a/lib/ansible/modules/extras/network/a10/a10_server.py
+++ b/lib/ansible/modules/extras/network/a10/a10_server.py
@@ -28,7 +28,7 @@ version_added: 1.8
 short_description: Manage A10 Networks AX/SoftAX/Thunder/vThunder devices
 description:
     - Manage slb server objects on A10 Networks devices via aXAPI
-author: '"Mischa Peters (@mischapeters)" <mpeters@a10networks.com>'
+author: "Mischa Peters (@mischapeters)"
 notes:
     - Requires A10 Networks aXAPI 2.1
 options:
diff --git a/lib/ansible/modules/extras/network/a10/a10_service_group.py b/lib/ansible/modules/extras/network/a10/a10_service_group.py
index 8e84bf9a07d..db1c21bc78e 100644
--- a/lib/ansible/modules/extras/network/a10/a10_service_group.py
+++ b/lib/ansible/modules/extras/network/a10/a10_service_group.py
@@ -28,7 +28,7 @@ version_added: 1.8
 short_description: Manage A10 Networks AX/SoftAX/Thunder/vThunder devices
 description:
     - Manage slb service-group objects on A10 Networks devices via aXAPI
-author: '"Mischa Peters (@mischapeters)" <mpeters@a10networks.com>'
+author: "Mischa Peters (@mischapeters)"
 notes:
     - Requires A10 Networks aXAPI 2.1
     - When a server doesn't exist and is added to the service-group the server will be created
diff --git a/lib/ansible/modules/extras/network/a10/a10_virtual_server.py b/lib/ansible/modules/extras/network/a10/a10_virtual_server.py
index 3df93f67dbe..eb308a3032a 100644
--- a/lib/ansible/modules/extras/network/a10/a10_virtual_server.py
+++ b/lib/ansible/modules/extras/network/a10/a10_virtual_server.py
@@ -28,7 +28,7 @@ version_added: 1.8
 short_description: Manage A10 Networks AX/SoftAX/Thunder/vThunder devices
 description:
     - Manage slb virtual server objects on A10 Networks devices via aXAPI
-author: '"Mischa Peters (@mischapeters)" <mpeters@a10networks.com>'
+author: "Mischa Peters (@mischapeters)"
 notes:
     - Requires A10 Networks aXAPI 2.1
 requirements:
diff --git a/lib/ansible/modules/extras/network/citrix/netscaler.py b/lib/ansible/modules/extras/network/citrix/netscaler.py
index 8f78e23caac..61bc35356e5 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 (@dominis)" <nandor@gawker.com>'
+author: "Nandor Sivok (@dominis)"
 '''
 
 EXAMPLES = '''
diff --git a/lib/ansible/modules/extras/network/f5/bigip_facts.py b/lib/ansible/modules/extras/network/f5/bigip_facts.py
index a36bc399bff..215a2cfe679 100644
--- a/lib/ansible/modules/extras/network/f5/bigip_facts.py
+++ b/lib/ansible/modules/extras/network/f5/bigip_facts.py
@@ -25,7 +25,7 @@ short_description: "Collect facts from F5 BIG-IP devices"
 description:
     - "Collect facts from F5 BIG-IP devices via iControl SOAP API"
 version_added: "1.6"
-author: '"Matt Hite (@mhite)" <mhite@hotmail.com>'
+author: "Matt Hite (@mhite)" 
 notes:
     - "Requires BIG-IP software version >= 11.4"
     - "F5 developed module 'bigsuds' required (see http://devcentral.f5.com)"
diff --git a/lib/ansible/modules/extras/network/f5/bigip_monitor_http.py b/lib/ansible/modules/extras/network/f5/bigip_monitor_http.py
index 8b102906cea..c2f6a87172e 100644
--- a/lib/ansible/modules/extras/network/f5/bigip_monitor_http.py
+++ b/lib/ansible/modules/extras/network/f5/bigip_monitor_http.py
@@ -27,7 +27,7 @@ short_description: "Manages F5 BIG-IP LTM http monitors"
 description:
     - "Manages F5 BIG-IP LTM monitors via iControl SOAP API"
 version_added: "1.4"
-author: '"Serge van Ginderachter (@srvg)" <serge@vanginderachter.be>'
+author: "Serge van Ginderachter (@srvg)"
 notes:
     - "Requires BIG-IP software version >= 11"
     - "F5 developed module 'bigsuds' required (see http://devcentral.f5.com)"
diff --git a/lib/ansible/modules/extras/network/f5/bigip_monitor_tcp.py b/lib/ansible/modules/extras/network/f5/bigip_monitor_tcp.py
index cab1770fbef..9a08418563c 100644
--- a/lib/ansible/modules/extras/network/f5/bigip_monitor_tcp.py
+++ b/lib/ansible/modules/extras/network/f5/bigip_monitor_tcp.py
@@ -25,7 +25,7 @@ short_description: "Manages F5 BIG-IP LTM tcp monitors"
 description:
     - "Manages F5 BIG-IP LTM tcp monitors via iControl SOAP API"
 version_added: "1.4"
-author: '"Serge van Ginderachter (@srvg)" <serge@vanginderachter.be>'
+author: "Serge van Ginderachter (@srvg)"
 notes:
     - "Requires BIG-IP software version >= 11"
     - "F5 developed module 'bigsuds' required (see http://devcentral.f5.com)"
diff --git a/lib/ansible/modules/extras/network/f5/bigip_node.py b/lib/ansible/modules/extras/network/f5/bigip_node.py
index eab65db35bb..7db197839f7 100644
--- a/lib/ansible/modules/extras/network/f5/bigip_node.py
+++ b/lib/ansible/modules/extras/network/f5/bigip_node.py
@@ -25,7 +25,7 @@ short_description: "Manages F5 BIG-IP LTM nodes"
 description:
     - "Manages F5 BIG-IP LTM nodes via iControl SOAP API"
 version_added: "1.4"
-author: '"Matt Hite (@mhite)" <mhite@hotmail.com>'
+author: "Matt Hite (@mhite)"
 notes:
     - "Requires BIG-IP software version >= 11"
     - "F5 developed module 'bigsuds' required (see http://devcentral.f5.com)"
diff --git a/lib/ansible/modules/extras/network/f5/bigip_pool.py b/lib/ansible/modules/extras/network/f5/bigip_pool.py
index 195eb9fd4ef..5330b0d4302 100644
--- a/lib/ansible/modules/extras/network/f5/bigip_pool.py
+++ b/lib/ansible/modules/extras/network/f5/bigip_pool.py
@@ -25,7 +25,7 @@ short_description: "Manages F5 BIG-IP LTM pools"
 description:
     - "Manages F5 BIG-IP LTM pools via iControl SOAP API"
 version_added: "1.2"
-author: '"Matt Hite (@mhite)" <mhite@hotmail.com>'
+author: "Matt Hite (@mhite)"
 notes:
     - "Requires BIG-IP software version >= 11"
     - "F5 developed module 'bigsuds' required (see http://devcentral.f5.com)"
diff --git a/lib/ansible/modules/extras/network/f5/bigip_pool_member.py b/lib/ansible/modules/extras/network/f5/bigip_pool_member.py
index 7fa9fe41462..f98c647c618 100644
--- a/lib/ansible/modules/extras/network/f5/bigip_pool_member.py
+++ b/lib/ansible/modules/extras/network/f5/bigip_pool_member.py
@@ -25,7 +25,7 @@ short_description: "Manages F5 BIG-IP LTM pool members"
 description:
     - "Manages F5 BIG-IP LTM pool members via iControl SOAP API"
 version_added: "1.4"
-author: '"Matt Hite (@mhite)" <mhite@hotmail.com>'
+author: "Matt Hite (@mhite)"
 notes:
     - "Requires BIG-IP software version >= 11"
     - "F5 developed module 'bigsuds' required (see http://devcentral.f5.com)"
diff --git a/lib/ansible/modules/extras/network/haproxy.py b/lib/ansible/modules/extras/network/haproxy.py
index 38757599df5..00fc4ff63a1 100644
--- a/lib/ansible/modules/extras/network/haproxy.py
+++ b/lib/ansible/modules/extras/network/haproxy.py
@@ -91,7 +91,7 @@ examples:
 # enable server in 'www' backend pool with change server(s) weight
 - haproxy: state=enabled host={{ inventory_hostname }} socket=/var/run/haproxy.sock weight=10 backend=www
 
-author: Ravi Bhure <ravibhure@gmail.com>
+author: "Ravi Bhure (@ravibhure)"
 '''
 
 import socket
diff --git a/lib/ansible/modules/extras/network/openvswitch_bridge.py b/lib/ansible/modules/extras/network/openvswitch_bridge.py
index 28df3e84426..b9ddff562c6 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 (@stygstra)" <david.stygstra@gmail.com>'
+author: "David Stygstra (@stygstra)"
 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 ab87ea42b4a..6f59f4b134b 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 (@stygstra)" <david.stygstra@gmail.com>'
+author: "David Stygstra (@stygstra)"
 short_description: Manage Open vSwitch ports
 requirements: [ ovs-vsctl ]
 description:
diff --git a/lib/ansible/modules/extras/notification/campfire.py b/lib/ansible/modules/extras/notification/campfire.py
index 9218826a7b4..2400ad3ba40 100644
--- a/lib/ansible/modules/extras/notification/campfire.py
+++ b/lib/ansible/modules/extras/notification/campfire.py
@@ -43,7 +43,7 @@ options:
 
 # informational: requirements for nodes
 requirements: [ urllib2, cgi ]
-author: '"Adam Garside (@fabulops)" <adam.garside@gmail.com>'
+author: "Adam Garside (@fabulops)"
 '''
 
 EXAMPLES = '''
diff --git a/lib/ansible/modules/extras/notification/flowdock.py b/lib/ansible/modules/extras/notification/flowdock.py
index aea107457fb..7c42e58644d 100644
--- a/lib/ansible/modules/extras/notification/flowdock.py
+++ b/lib/ansible/modules/extras/notification/flowdock.py
@@ -22,7 +22,7 @@ DOCUMENTATION = '''
 ---
 module: flowdock
 version_added: "1.2"
-author: '"Matt Coddington (@mcodd)" <coddington@gmail.com>'
+author: "Matt Coddington (@mcodd)" 
 short_description: Send a message to a flowdock
 description:
    - Send a message to a flowdock team inbox or chat using the push API (see https://www.flowdock.com/api/team-inbox and https://www.flowdock.com/api/chat)
diff --git a/lib/ansible/modules/extras/notification/grove.py b/lib/ansible/modules/extras/notification/grove.py
index 5c27b18c30f..85601d1cc78 100644
--- a/lib/ansible/modules/extras/notification/grove.py
+++ b/lib/ansible/modules/extras/notification/grove.py
@@ -39,7 +39,7 @@ options:
     default: 'yes'
     choices: ['yes', 'no']
     version_added: 1.5.1
-author: '"Jonas Pfenniger (@zimbatm)" <zimbatm@zimbatm.com>'
+author: "Jonas Pfenniger (@zimbatm)"
 '''
 
 EXAMPLES = '''
diff --git a/lib/ansible/modules/extras/notification/mail.py b/lib/ansible/modules/extras/notification/mail.py
index 4feaebf5d36..c42e80fdabf 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 (@dagwieers)" <dag@wieers.com>'
+author: "Dag Wieers (@dagwieers)" 
 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 a1dd9c2b64d..d0c3d05e65c 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 (@sivel)" <matt@sivel.net>'
+author: "Matt Martz (@sivel)"
 options:
   api_key:
     description:
diff --git a/lib/ansible/modules/extras/notification/pushover.py b/lib/ansible/modules/extras/notification/pushover.py
index 951c65f43fe..505917189e4 100644
--- a/lib/ansible/modules/extras/notification/pushover.py
+++ b/lib/ansible/modules/extras/notification/pushover.py
@@ -48,7 +48,7 @@ options:
     description: Message priority (see u(https://pushover.net) for details.)
     required: false
 
-author: '"Jim Richardson (@weaselkeeper)" <weaselkeeper@gmail.com>'
+author: "Jim Richardson (@weaselkeeper)"
 '''
 
 EXAMPLES = '''
diff --git a/lib/ansible/modules/extras/notification/sendgrid.py b/lib/ansible/modules/extras/notification/sendgrid.py
index 6278f613ee4..78806687e0b 100644
--- a/lib/ansible/modules/extras/notification/sendgrid.py
+++ b/lib/ansible/modules/extras/notification/sendgrid.py
@@ -53,7 +53,7 @@ options:
       the desired subject for the email
     required: true
 
-author: '"Matt Makai (@makaimc)" <matthew.makai@gmail.com>'
+author: "Matt Makai (@makaimc)"
 '''
 
 EXAMPLES = '''
diff --git a/lib/ansible/modules/extras/notification/slack.py b/lib/ansible/modules/extras/notification/slack.py
index 7e5215479ab..baabe4f58d2 100644
--- a/lib/ansible/modules/extras/notification/slack.py
+++ b/lib/ansible/modules/extras/notification/slack.py
@@ -24,7 +24,7 @@ short_description: Send Slack notifications
 description:
     - The M(slack) module sends notifications to U(http://slack.com) via the Incoming WebHook integration
 version_added: 1.6
-author: '"Ramon de la Fuente (@ramondelafuente)" <ramon@delafuente.nl>'
+author: "Ramon de la Fuente (@ramondelafuente)"
 options:
   domain:
     description:
diff --git a/lib/ansible/modules/extras/notification/sns.py b/lib/ansible/modules/extras/notification/sns.py
index 910105f0ebb..70030d66196 100644
--- a/lib/ansible/modules/extras/notification/sns.py
+++ b/lib/ansible/modules/extras/notification/sns.py
@@ -24,7 +24,7 @@ short_description: Send Amazon Simple Notification Service (SNS) messages
 description:
     - The M(sns) module sends notifications to a topic on your Amazon SNS account
 version_added: 1.6
-author: '"Michael J. Schultz (@mjschultz)" <mjschultz@gmail.com>'
+author: "Michael J. Schultz (@mjschultz)" 
 options:
   msg:
     description:
diff --git a/lib/ansible/modules/extras/notification/twilio.py b/lib/ansible/modules/extras/notification/twilio.py
index 568d0c60a58..e9ec5bcf51e 100644
--- a/lib/ansible/modules/extras/notification/twilio.py
+++ b/lib/ansible/modules/extras/notification/twilio.py
@@ -58,7 +58,7 @@ options:
       (multimedia message) instead of a plain SMS
     required: false
 
-author: '"Matt Makai (@makaimc)" <matthew.makai@gmail.com>'
+author: "Matt Makai (@makaimc)"
 '''
 
 EXAMPLES = '''
diff --git a/lib/ansible/modules/extras/notification/typetalk.py b/lib/ansible/modules/extras/notification/typetalk.py
index 8e79a7617ed..638f97ae530 100644
--- a/lib/ansible/modules/extras/notification/typetalk.py
+++ b/lib/ansible/modules/extras/notification/typetalk.py
@@ -26,7 +26,7 @@ options:
       - message body
     required: true
 requirements: [ urllib, urllib2, json ]
-author: '"Takashi Someda (@tksmd)" <someda@isenshi.com>'
+author: "Takashi Someda (@tksmd)"
 '''
 
 EXAMPLES = '''
diff --git a/lib/ansible/modules/extras/packaging/language/bower.py b/lib/ansible/modules/extras/packaging/language/bower.py
index 8fbe20f7e0c..7af8136a445 100644
--- a/lib/ansible/modules/extras/packaging/language/bower.py
+++ b/lib/ansible/modules/extras/packaging/language/bower.py
@@ -25,7 +25,7 @@ short_description: Manage bower packages with bower
 description:
   - Manage bower packages with bower
 version_added: 1.9
-author: '"Michael Warkentin (@mwarkentin)" <mwarkentin@gmail.com>'
+author: "Michael Warkentin (@mwarkentin)"
 options:
   name:
     description:
diff --git a/lib/ansible/modules/extras/packaging/language/composer.py b/lib/ansible/modules/extras/packaging/language/composer.py
index cfe3f99b9e7..8e11d25216b 100644
--- a/lib/ansible/modules/extras/packaging/language/composer.py
+++ b/lib/ansible/modules/extras/packaging/language/composer.py
@@ -22,7 +22,7 @@
 DOCUMENTATION = '''
 ---
 module: composer
-author: '"Dimitrios Tydeas Mengidis (@dmtrs)" <tydeas.dr@gmail.com>'
+author: "Dimitrios Tydeas Mengidis (@dmtrs)"
 short_description: Dependency Manager for PHP
 version_added: "1.6"
 description:
diff --git a/lib/ansible/modules/extras/packaging/language/cpanm.py b/lib/ansible/modules/extras/packaging/language/cpanm.py
index 5549dab8895..02b306b669c 100644
--- a/lib/ansible/modules/extras/packaging/language/cpanm.py
+++ b/lib/ansible/modules/extras/packaging/language/cpanm.py
@@ -73,7 +73,7 @@ examples:
      description: Install I(Dancer) perl package from a specific mirror
 notes:
    - Please note that U(http://search.cpan.org/dist/App-cpanminus/bin/cpanm, cpanm) must be installed on the remote host.
-author: '"Franck Cuny (@franckcuny)" <franck@lumberjaph.net>'
+author: "Franck Cuny (@franckcuny)"
 '''
 
 def _is_package_installed(module, name, locallib, cpanm):
diff --git a/lib/ansible/modules/extras/packaging/language/maven_artifact.py b/lib/ansible/modules/extras/packaging/language/maven_artifact.py
index 057cb0a3814..3e196dd93a5 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 (@chrisisbeef)" <chris.schmidt () contrastsecurity.com>'
+author: "Chris Schmidt (@chrisisbeef)"
 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 3eafcd6c2a7..d804efff331 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 (@chrishoffman)" <christopher.hoffman@gmail.com>'
+author: "Chris Hoffman (@chrishoffman)"
 options:
   name:
     description:
diff --git a/lib/ansible/modules/extras/packaging/os/dnf.py b/lib/ansible/modules/extras/packaging/os/dnf.py
index 35d84b42c5c..ee800697d3f 100644
--- a/lib/ansible/modules/extras/packaging/os/dnf.py
+++ b/lib/ansible/modules/extras/packaging/os/dnf.py
@@ -102,7 +102,7 @@ notes: []
 requirements:
   - dnf
   - yum-utils (for repoquery)
-author: '"Cristian van Ee (@DJMuggs)" <cristian at cvee.org>'
+author: "Cristian van Ee (@DJMuggs)"
 '''
 
 EXAMPLES = '''
diff --git a/lib/ansible/modules/extras/packaging/os/homebrew.py b/lib/ansible/modules/extras/packaging/os/homebrew.py
index 0b37521820d..91888ba6bca 100644
--- a/lib/ansible/modules/extras/packaging/os/homebrew.py
+++ b/lib/ansible/modules/extras/packaging/os/homebrew.py
@@ -23,8 +23,8 @@ DOCUMENTATION = '''
 ---
 module: homebrew
 author:
-    - '"Daniel Jaouen (@danieljaouen)" <dcj24@cornell.edu>'
-    - '"Andrew Dunham (@andrew-d)" <andrew@du.nham.ca>'
+    - "Daniel Jaouen (@danieljaouen)"
+    - "Andrew Dunham (@andrew-d)"
 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 bb5cacabbc7..e1b721a97b4 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 (@danieljaouen)" <dcj24@cornell.edu>'
+author: "Daniel Jaouen (@danieljaouen)"
 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 504e77eb062..c6511f0c7b2 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 (@danieljaouen)" <dcj24@cornell.edu>'
+author: "Daniel Jaouen (@danieljaouen)"
 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 3cad5e35642..c9d6b8ed333 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 (@jirutka)" <jakub@jirutka.cz>'
+author: "Jakub Jirutka (@jirutka)"
 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 2f81753fb64..1b5d0bb06b2 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 (@eest)" <patrik.lundin.swe@gmail.com>'
+author: "Patrik Lundin (@eest)"
 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 8f06a03a1b2..5b75ad1a260 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 (@skinp)" <pp.pelletier@gmail.com>'
+author: "Patrick Pelletier (@skinp)"
 short_description: Package manager for OpenWrt
 description:
     - Manages OpenWrt packages
diff --git a/lib/ansible/modules/extras/packaging/os/pkg5.py b/lib/ansible/modules/extras/packaging/os/pkg5.py
index 0a1291a3196..686824fa196 100644
--- a/lib/ansible/modules/extras/packaging/os/pkg5.py
+++ b/lib/ansible/modules/extras/packaging/os/pkg5.py
@@ -19,7 +19,7 @@
 DOCUMENTATION = '''
 ---
 module: pkg5
-author: '"Peter Oliver (@mavit)" <ansible@mavit.org.uk>'
+author: "Peter Oliver (@mavit)"
 short_description: Manages packages with the Solaris 11 Image Packaging System
 description:
   - IPS packages are the native packages in Solaris 11 and higher.
diff --git a/lib/ansible/modules/extras/packaging/os/pkg5_publisher.py b/lib/ansible/modules/extras/packaging/os/pkg5_publisher.py
index b0d198faaae..e283ca200fb 100644
--- a/lib/ansible/modules/extras/packaging/os/pkg5_publisher.py
+++ b/lib/ansible/modules/extras/packaging/os/pkg5_publisher.py
@@ -19,7 +19,7 @@
 DOCUMENTATION = '''
 ---
 module: pkg5_publisher
-author: '"Peter Oliver (@mavit)" <ansible@mavit.org.uk>'
+author: "Peter Oliver (@mavit)"
 short_description: Manages Solaris 11 Image Packaging System publishers
 description:
   - IPS packages are the native packages in Solaris 11 and higher.
diff --git a/lib/ansible/modules/extras/packaging/os/pkgin.py b/lib/ansible/modules/extras/packaging/os/pkgin.py
index 33bcb5482f0..e600026409b 100644
--- a/lib/ansible/modules/extras/packaging/os/pkgin.py
+++ b/lib/ansible/modules/extras/packaging/os/pkgin.py
@@ -31,8 +31,8 @@ description:
       or any OS that uses C(pkgsrc).  (Home: U(http://pkgin.net/))"
 version_added: "1.0"
 author:
-    - '"Larry Gilbert (L2G)" <larry@L2G.to>'
-    - '"Shaun Zinck (@szinck)" <shaun.zinck at gmail.com>'
+    - "Larry Gilbert (L2G)"
+    - "Shaun Zinck (@szinck)"
 notes:
     - "Known bug with pkgin < 0.8.0: if a package is removed and another
       package depends on it, the other package will be silently removed as
diff --git a/lib/ansible/modules/extras/packaging/os/pkgng.py b/lib/ansible/modules/extras/packaging/os/pkgng.py
index 132cff637e6..c0819dbe5b8 100644
--- a/lib/ansible/modules/extras/packaging/os/pkgng.py
+++ b/lib/ansible/modules/extras/packaging/os/pkgng.py
@@ -63,7 +63,7 @@ options:
               for newer pkgng versions, specify a the name of a repository
               configured in /usr/local/etc/pkg/repos
         required: false
-author: '"bleader (@bleader)" <bleader@ratonland.org>'
+author: "bleader (@bleader)" 
 notes:
     - When using pkgsite, be careful that already in cache packages won't be downloaded again.
 '''
diff --git a/lib/ansible/modules/extras/packaging/os/pkgutil.py b/lib/ansible/modules/extras/packaging/os/pkgutil.py
index 62107aa0475..3a4720630cf 100644
--- a/lib/ansible/modules/extras/packaging/os/pkgutil.py
+++ b/lib/ansible/modules/extras/packaging/os/pkgutil.py
@@ -32,7 +32,7 @@ description:
     - Pkgutil is an advanced packaging system, which resolves dependency on installation.
       It is designed for CSW packages.
 version_added: "1.3"
-author: '"Alexander Winkler (@dermute)" <mail () winkler-alexander.de>'
+author: "Alexander Winkler (@dermute)"
 options:
   name:
     description:
diff --git a/lib/ansible/modules/extras/packaging/os/portinstall.py b/lib/ansible/modules/extras/packaging/os/portinstall.py
index 1673c4dde37..b4e3044167e 100644
--- a/lib/ansible/modules/extras/packaging/os/portinstall.py
+++ b/lib/ansible/modules/extras/packaging/os/portinstall.py
@@ -43,7 +43,7 @@ options:
         choices: [ 'yes', 'no' ]
         required: false
         default: yes
-author: '"berenddeboer (@berenddeboer)" <berend@pobox.com>'
+author: "berenddeboer (@berenddeboer)"
 '''
 
 EXAMPLES = '''
diff --git a/lib/ansible/modules/extras/packaging/os/swdepot.py b/lib/ansible/modules/extras/packaging/os/swdepot.py
index 56b33d401bf..157fa212c17 100644
--- a/lib/ansible/modules/extras/packaging/os/swdepot.py
+++ b/lib/ansible/modules/extras/packaging/os/swdepot.py
@@ -29,7 +29,7 @@ description:
     - Will install, upgrade and remove packages with swdepot package manager (HP-UX)
 version_added: "1.4"
 notes: []
-author: '"Raul Melo (@melodous)" <raulmelo@gmail.com>'
+author: "Raul Melo (@melodous)"
 options:
     name:
         description:
diff --git a/lib/ansible/modules/extras/packaging/os/urpmi.py b/lib/ansible/modules/extras/packaging/os/urpmi.py
index c202ee27ace..7b7aaefbd1d 100644
--- a/lib/ansible/modules/extras/packaging/os/urpmi.py
+++ b/lib/ansible/modules/extras/packaging/os/urpmi.py
@@ -57,7 +57,7 @@ options:
     required: false
     default: yes
     choices: [ "yes", "no" ]
-author: '"Philippe Makowski (@pmakowski)" <philippem@mageia.org>'
+author: "Philippe Makowski (@pmakowski)"
 notes:  []
 '''
 
diff --git a/lib/ansible/modules/extras/packaging/os/zypper.py b/lib/ansible/modules/extras/packaging/os/zypper.py
index c175c152050..f3205051fdf 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 (@dirtyharrycallahan)" <pmc@patrickcallahan.com>'
+author: "Patrick Callahan (@dirtyharrycallahan)"
 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 3210e93d391..54e20429638 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 (@matze)" <matthias.vogelgesang@gmail.com>'
+author: "Matthias Vogelgesang (@matze)"
 version_added: "1.4"
 short_description: Add and remove Zypper repositories
 description:
diff --git a/lib/ansible/modules/extras/source_control/bzr.py b/lib/ansible/modules/extras/source_control/bzr.py
index 5519a8af123..0fc6ac28584 100644
--- a/lib/ansible/modules/extras/source_control/bzr.py
+++ b/lib/ansible/modules/extras/source_control/bzr.py
@@ -22,7 +22,7 @@
 DOCUMENTATION = u'''
 ---
 module: bzr
-author: '"André Paramés (@andreparames)" <git@andreparames.com>'
+author: "André Paramés (@andreparames)"
 version_added: "1.1"
 short_description: Deploy software (or files) from bzr branches
 description:
diff --git a/lib/ansible/modules/extras/source_control/github_hooks.py b/lib/ansible/modules/extras/source_control/github_hooks.py
index bb60b634cb3..d75fcb1573d 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 (@pcgentry)" <phillip@cx.com>'
+author: "Phillip Gentry, CX Inc (@pcgentry)"
 '''
 
 EXAMPLES = '''
diff --git a/lib/ansible/modules/extras/system/alternatives.py b/lib/ansible/modules/extras/system/alternatives.py
index 06d9bea25f0..90e2237f86c 100644
--- a/lib/ansible/modules/extras/system/alternatives.py
+++ b/lib/ansible/modules/extras/system/alternatives.py
@@ -31,8 +31,8 @@ description:
     - Useful when multiple programs are installed but provide similar functionality (e.g. different editors).
 version_added: "1.6"
 author:
-    - '"David Wittman (@DavidWittman)" <dwittman@gmail.com>'
-    - '"Gabe Mulley (@mulby)" <gabe.mulley@gmail.com>'
+    - "David Wittman (@DavidWittman)"
+    - "Gabe Mulley (@mulby)"
 options:
   name:
     description:
diff --git a/lib/ansible/modules/extras/system/at.py b/lib/ansible/modules/extras/system/at.py
index 03ac14a44aa..0ce9ff2c7d4 100644
--- a/lib/ansible/modules/extras/system/at.py
+++ b/lib/ansible/modules/extras/system/at.py
@@ -59,7 +59,7 @@ options:
     default: false
 requirements:
  - at
-author: '"Richard Isaacson (@risaacson)" <richard.c.isaacson@gmail.com>'
+author: "Richard Isaacson (@risaacson)"
 '''
 
 EXAMPLES = '''
diff --git a/lib/ansible/modules/extras/system/capabilities.py b/lib/ansible/modules/extras/system/capabilities.py
index 0c7f2e22d0b..ce8ffcfa632 100644
--- a/lib/ansible/modules/extras/system/capabilities.py
+++ b/lib/ansible/modules/extras/system/capabilities.py
@@ -50,7 +50,7 @@ notes:
       and flags to compare, so you will want to ensure that your capabilities
       argument matches the final capabilities.
 requirements: []
-author: '"Nate Coraor (@natefoo)" <nate@bx.psu.edu>'
+author: "Nate Coraor (@natefoo)"
 '''
 
 EXAMPLES = '''
diff --git a/lib/ansible/modules/extras/system/crypttab.py b/lib/ansible/modules/extras/system/crypttab.py
index 5b0edc62363..44d9f859791 100644
--- a/lib/ansible/modules/extras/system/crypttab.py
+++ b/lib/ansible/modules/extras/system/crypttab.py
@@ -69,7 +69,7 @@ options:
 
 notes: []
 requirements: []
-author: '"Steve (@groks)" <yo@groks.org>'
+author: "Steve (@groks)"
 '''
 
 EXAMPLES = '''
diff --git a/lib/ansible/modules/extras/system/filesystem.py b/lib/ansible/modules/extras/system/filesystem.py
index a2f979ecd0b..1e867f30270 100644
--- a/lib/ansible/modules/extras/system/filesystem.py
+++ b/lib/ansible/modules/extras/system/filesystem.py
@@ -20,7 +20,7 @@
 
 DOCUMENTATION = '''
 ---
-author: '"Alexander Bulimov (@abulimov)" <lazywolf0@gmail.com>'
+author: "Alexander Bulimov (@abulimov)"
 module: filesystem
 short_description: Makes file system on block device
 description:
diff --git a/lib/ansible/modules/extras/system/firewalld.py b/lib/ansible/modules/extras/system/firewalld.py
index e16e4e4a9dd..37ed1801f68 100644
--- a/lib/ansible/modules/extras/system/firewalld.py
+++ b/lib/ansible/modules/extras/system/firewalld.py
@@ -69,7 +69,7 @@ options:
 notes:
   - Not tested on any Debian based system.
 requirements: [ 'firewalld >= 0.2.11' ]
-author: '"Adam Miller (@maxamillion)" <maxamillion@fedoraproject.org>'
+author: "Adam Miller (@maxamillion)" 
 '''
 
 EXAMPLES = '''
diff --git a/lib/ansible/modules/extras/system/gluster_volume.py b/lib/ansible/modules/extras/system/gluster_volume.py
index 32359cd2a82..7719006502d 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ä (@rosmo)" <taneli@crasman.fi>'
+author: "Taneli Leppä (@rosmo)"
 """
 
 EXAMPLES = """
diff --git a/lib/ansible/modules/extras/system/kernel_blacklist.py b/lib/ansible/modules/extras/system/kernel_blacklist.py
index b0901473867..296a082a2ea 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 (@matze)" <matthias.vogelgesang@gmail.com>'
+author: "Matthias Vogelgesang (@matze)"
 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 74c6b0e90c7..303d9410d1e 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 (@mcv21)" <mcv21@cam.ac.uk>'
+author: "Matthew Vernon (@mcv21)"
 '''
 
 EXAMPLES = '''
diff --git a/lib/ansible/modules/extras/system/lvg.py b/lib/ansible/modules/extras/system/lvg.py
index 3c6c5ef2930..9e3ba2d2931 100644
--- a/lib/ansible/modules/extras/system/lvg.py
+++ b/lib/ansible/modules/extras/system/lvg.py
@@ -21,7 +21,7 @@
 
 DOCUMENTATION = '''
 ---
-author: '"Alexander Bulimov (@abulimov)" <lazywolf0@gmail.com>'
+author: "Alexander Bulimov (@abulimov)"
 module: lvg
 short_description: Configure LVM volume groups
 description:
diff --git a/lib/ansible/modules/extras/system/lvol.py b/lib/ansible/modules/extras/system/lvol.py
index 8365fc68b95..6c33048a3ca 100644
--- a/lib/ansible/modules/extras/system/lvol.py
+++ b/lib/ansible/modules/extras/system/lvol.py
@@ -21,8 +21,8 @@
 DOCUMENTATION = '''
 ---
 author:
-    - '"Jeroen Hoekx (@jhoekx)" <jeroen.hoekx@dsquare.be>'
-    - '"Alexander Bulimov (@abulimov)" <lazywolf0@gmail.com>'
+    - "Jeroen Hoekx (@jhoekx)" 
+    - "Alexander Bulimov (@abulimov)" 
 module: lvol
 short_description: Configure LVM logical volumes
 description:
diff --git a/lib/ansible/modules/extras/system/modprobe.py b/lib/ansible/modules/extras/system/modprobe.py
index bf58e435552..64e36c784a7 100644
--- a/lib/ansible/modules/extras/system/modprobe.py
+++ b/lib/ansible/modules/extras/system/modprobe.py
@@ -26,9 +26,9 @@ short_description: Add or remove kernel modules
 requirements: []
 version_added: 1.4
 author:
-    - '"David Stygstra (@stygstra)" <david.stygstra@gmail.com>'
-    - Julien Dauphant
-    - Matt Jeffery
+    - "David Stygstra (@stygstra)" 
+    - "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 97652311f8d..e2477538888 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 (@srvg)" <serge@vanginderachter.be>'
+author: "Serge van Ginderachter (@srvg)"
 version_added: "1.4"
 short_description: Manage iscsi targets with open-iscsi
 description:
diff --git a/lib/ansible/modules/extras/system/ufw.py b/lib/ansible/modules/extras/system/ufw.py
index 91d574f945d..cd148edf2ef 100644
--- a/lib/ansible/modules/extras/system/ufw.py
+++ b/lib/ansible/modules/extras/system/ufw.py
@@ -29,9 +29,9 @@ description:
     - Manage firewall with UFW.
 version_added: 1.6
 author:
-    - '"Aleksey Ovcharenko (@ovcharenko)" <aleksey.ovcharenko@gmail.com>'
-    - '"Jarno Keskikangas (@pyykkis)" <jarno.keskikangas@gmail.com>'
-    - '"Ahti Kitsik (@ahtik)" <ak@ahtik.com>'
+    - "Aleksey Ovcharenko (@ovcharenko)"
+    - "Jarno Keskikangas (@pyykkis)"
+    - "Ahti Kitsik (@ahtik)"
 notes:
     - See C(man ufw) for more examples.
 requirements:
diff --git a/lib/ansible/modules/extras/system/zfs.py b/lib/ansible/modules/extras/system/zfs.py
index 97a0d6f3dba..c3c87634377 100644
--- a/lib/ansible/modules/extras/system/zfs.py
+++ b/lib/ansible/modules/extras/system/zfs.py
@@ -206,7 +206,7 @@ options:
       - The zoned property.
     required: False
     choices: ['on','off']
-author: '"Johan Wiren (@johanwiren)" <johan.wiren.se@gmail.com>'
+author: "Johan Wiren (@johanwiren)"
 '''
 
 EXAMPLES = '''
diff --git a/lib/ansible/modules/extras/web_infrastructure/ejabberd_user.py b/lib/ansible/modules/extras/web_infrastructure/ejabberd_user.py
index 79fe94fcddc..bf86806ad52 100644
--- a/lib/ansible/modules/extras/web_infrastructure/ejabberd_user.py
+++ b/lib/ansible/modules/extras/web_infrastructure/ejabberd_user.py
@@ -20,7 +20,7 @@ DOCUMENTATION = '''
 ---
 module: ejabberd_user
 version_added: "1.5"
-author: '"Peter Sprygada (@privateip)" <sprygada@gmail.com>'
+author: "Peter Sprygada (@privateip)"
 short_description: Manages users for ejabberd servers
 requirements:
     - ejabberd with mod_admin_extra
diff --git a/lib/ansible/modules/extras/web_infrastructure/jboss.py b/lib/ansible/modules/extras/web_infrastructure/jboss.py
index a0949c47531..9ec67b7c7b1 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 (@jhoekx)" <jeroen.hoekx@dsquare.be>'
+author: "Jeroen Hoekx (@jhoekx)"
 """
 
 EXAMPLES = """
diff --git a/lib/ansible/modules/extras/web_infrastructure/jira.py b/lib/ansible/modules/extras/web_infrastructure/jira.py
index 3dc963cb6bd..79cfb72d4a7 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 (@tarka)" <ssmith@atlassian.com>'
+author: "Steve Smith (@tarka)"
 """
 
 EXAMPLES = """
diff --git a/lib/ansible/modules/extras/windows/win_updates.py b/lib/ansible/modules/extras/windows/win_updates.py
index e49e084aad0..bc5a83d3c24 100644
--- a/lib/ansible/modules/extras/windows/win_updates.py
+++ b/lib/ansible/modules/extras/windows/win_updates.py
@@ -41,7 +41,7 @@ options:
       - (anything that is a valid update category)
     default: critical
     aliases: []
-author: '"Peter Mounce (@petemounce)" <public@neverrunwithscissors.com>'
+author: "Peter Mounce (@petemounce)"
 '''
 
 EXAMPLES = '''