diff --git a/AUTHORS b/AUTHORS
index 388d8360dd56116416b0e1f57f0ea488dfb351e7..7f919d4a2ad42608752e3ae3850e0b61627d9cec 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -137,7 +137,6 @@ ownCloud is written by:
  - Sam Tuke <mail@samtuke.com>
  - Sander <brantje@gmail.com>
  - Sascha Schmidt <realriot@realriot.de>
- - Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  - Sean Comeau <sean@ftlnetworks.ca>
  - Sebastian Döll <sebastian.doell@libasys.de>
  - Serge Martin <edb@sigluy.net>
diff --git a/apps/dav/lib/caldav/caldavbackend.php b/apps/dav/lib/caldav/caldavbackend.php
index 2437671801948ec8581fd7a67e7c927288ca5bcb..521d1b1de5e82c1ada71c4fbbc37e8d05853040a 100644
--- a/apps/dav/lib/caldav/caldavbackend.php
+++ b/apps/dav/lib/caldav/caldavbackend.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * @author Joas Schilling <nickvergessen@owncloud.com>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2016, ownCloud, Inc.
diff --git a/apps/dav/lib/carddav/carddavbackend.php b/apps/dav/lib/carddav/carddavbackend.php
index 28eb3c0445cb5085bbddc6a1645f9a72ec8a16a1..687ef7f3a878d4d0066599f98e7bb44a9e635e21 100644
--- a/apps/dav/lib/carddav/carddavbackend.php
+++ b/apps/dav/lib/carddav/carddavbackend.php
@@ -3,7 +3,6 @@
  * @author Arthur Schiwon <blizzz@owncloud.com>
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Joas Schilling <nickvergessen@owncloud.com>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2016, ownCloud, Inc.
diff --git a/apps/dav/lib/connector/sabre/fakelockerplugin.php b/apps/dav/lib/connector/sabre/fakelockerplugin.php
index f585a74444ff38746ebf82e6d0f109ed64f500b8..6db8740bc13cfa937af4faecec95e7d6b23d2413 100644
--- a/apps/dav/lib/connector/sabre/fakelockerplugin.php
+++ b/apps/dav/lib/connector/sabre/fakelockerplugin.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * @author Lukas Reschke <lukas@owncloud.com>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2016, ownCloud, Inc.
diff --git a/apps/dav/lib/connector/sabre/file.php b/apps/dav/lib/connector/sabre/file.php
index 9c8344bc5db8522140ce81be98384dc672e565de..5e516bf22acb57d935916d6d42267382edaa06ab 100644
--- a/apps/dav/lib/connector/sabre/file.php
+++ b/apps/dav/lib/connector/sabre/file.php
@@ -10,7 +10,6 @@
  * @author Owen Winkler <a_github@midnightcircus.com>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Roeland Jago Douma <rullzer@owncloud.com>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/apps/dav/lib/connector/sabre/node.php b/apps/dav/lib/connector/sabre/node.php
index 64e9ec9d2b742c6da495f5c2344728285e9e6118..41dcb421913236c9c752ba96a51e40c9553a25f5 100644
--- a/apps/dav/lib/connector/sabre/node.php
+++ b/apps/dav/lib/connector/sabre/node.php
@@ -8,7 +8,6 @@
  * @author Markus Goetz <markus@woboq.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/apps/dav/lib/connector/sabre/principal.php b/apps/dav/lib/connector/sabre/principal.php
index a573124007d831eea97da072be25a35f379afa27..31de4e5bad13a74cf52e10752fa6e61355f028cd 100644
--- a/apps/dav/lib/connector/sabre/principal.php
+++ b/apps/dav/lib/connector/sabre/principal.php
@@ -5,7 +5,6 @@
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Thomas Tanghus <thomas@tanghus.net>
  * @author Vincent Petry <pvince81@owncloud.com>
diff --git a/apps/dav/lib/connector/sabre/quotaplugin.php b/apps/dav/lib/connector/sabre/quotaplugin.php
index 6b5b7711439e02ac40518056b6f4053685f0c3d0..a093c52851c86bfb12ccc6e1ab9b6cba1ff2088b 100644
--- a/apps/dav/lib/connector/sabre/quotaplugin.php
+++ b/apps/dav/lib/connector/sabre/quotaplugin.php
@@ -4,7 +4,6 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author scambra <sergio@entrecables.com>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/apps/dav/lib/dav/sharing/plugin.php b/apps/dav/lib/dav/sharing/plugin.php
index e6eab3539b3b87f14d5fd5722150be2c0f3c8649..3173d1397ba1139a29f343c17d70ca81bb3a8610 100644
--- a/apps/dav/lib/dav/sharing/plugin.php
+++ b/apps/dav/lib/dav/sharing/plugin.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2016, ownCloud, Inc.
diff --git a/apps/dav/lib/systemtag/systemtagsbyidcollection.php b/apps/dav/lib/systemtag/systemtagsbyidcollection.php
index 52d4a143b4195cfe1b83c592f9f6f744f9320af0..298902501ab4d09e5851b3a865163328ee8f5a2a 100644
--- a/apps/dav/lib/systemtag/systemtagsbyidcollection.php
+++ b/apps/dav/lib/systemtag/systemtagsbyidcollection.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/apps/dav/lib/systemtag/systemtagsobjecttypecollection.php b/apps/dav/lib/systemtag/systemtagsobjecttypecollection.php
index 93cc75619289187f60204e42ae4f7a3e5aa316a2..bdbc73c4e322069a60f37f4da58c320161b1c553 100644
--- a/apps/dav/lib/systemtag/systemtagsobjecttypecollection.php
+++ b/apps/dav/lib/systemtag/systemtagsobjecttypecollection.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/apps/dav/tests/unit/connector/sabre/file.php b/apps/dav/tests/unit/connector/sabre/file.php
index c1c162f1373a213f4b070a67fcab487afbdee799..8bbef2254838123e1b9131779a77dff93528b498 100644
--- a/apps/dav/tests/unit/connector/sabre/file.php
+++ b/apps/dav/tests/unit/connector/sabre/file.php
@@ -2,7 +2,6 @@
 /**
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Robin Appelman <icewind@owncloud.com>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/apps/dav/tests/unit/connector/sabre/filesplugin.php b/apps/dav/tests/unit/connector/sabre/filesplugin.php
index cbc847ebdb8d981d443cd3cd9a915632b179bcd5..c363ece374a62b8301ce4efb4f1ec14b7dcfad22 100644
--- a/apps/dav/tests/unit/connector/sabre/filesplugin.php
+++ b/apps/dav/tests/unit/connector/sabre/filesplugin.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * @author Roeland Jago Douma <rullzer@owncloud.com>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/apps/encryption/hooks/userhooks.php b/apps/encryption/hooks/userhooks.php
index 3f84187bc1e360bf73248aa071fd7d46f0332827..62acd1689094b862a8c61ce709728fc2e000fa2e 100644
--- a/apps/encryption/hooks/userhooks.php
+++ b/apps/encryption/hooks/userhooks.php
@@ -2,7 +2,6 @@
 /**
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Clark Tomlinson <fallen013@gmail.com>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2016, ownCloud, Inc.
diff --git a/apps/encryption/lib/crypto/crypt.php b/apps/encryption/lib/crypto/crypt.php
index b4c10f42790ac87f5557b9864f4bb3a43e321302..645f1ff05470b2539b3023d6748c01c2ed1b64a2 100644
--- a/apps/encryption/lib/crypto/crypt.php
+++ b/apps/encryption/lib/crypto/crypt.php
@@ -4,7 +4,6 @@
  * @author Clark Tomlinson <fallen013@gmail.com>
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Lukas Reschke <lukas@owncloud.com>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2016, ownCloud, Inc.
diff --git a/apps/encryption/lib/crypto/encryption.php b/apps/encryption/lib/crypto/encryption.php
index 620bdd6ca9a889d70dc1e1e8998d273eb1363f4f..10c8c4a290af239b98d81b0966635157fb3d8e6b 100644
--- a/apps/encryption/lib/crypto/encryption.php
+++ b/apps/encryption/lib/crypto/encryption.php
@@ -5,7 +5,6 @@
  * @author Jan-Christoph Borchardt <hey@jancborchardt.net>
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Lukas Reschke <lukas@owncloud.com>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2016, ownCloud, Inc.
diff --git a/apps/encryption/lib/keymanager.php b/apps/encryption/lib/keymanager.php
index b65d6c81eb005282cb8b3d3b4a37c94b3d09044e..12fa5f92bd5e9c14050843fd95daf73b76905854 100644
--- a/apps/encryption/lib/keymanager.php
+++ b/apps/encryption/lib/keymanager.php
@@ -3,7 +3,6 @@
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Clark Tomlinson <fallen013@gmail.com>
  * @author Lukas Reschke <lukas@owncloud.com>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/apps/encryption/lib/migration.php b/apps/encryption/lib/migration.php
index 1b79ddfe7f1e53e894de258c2b42fe3a8e505417..db9541d6f5a41039f4f4dca26c05da2be178faff 100644
--- a/apps/encryption/lib/migration.php
+++ b/apps/encryption/lib/migration.php
@@ -3,7 +3,6 @@
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Robin Appelman <icewind@owncloud.com>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  *
  * @copyright Copyright (c) 2016, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/lib/recovery.php b/apps/encryption/lib/recovery.php
index 8833ea8f0ed0589493018a88960a677c05d2bd59..f0ac7bb238317d1e4a90c60d33b325185f988995 100644
--- a/apps/encryption/lib/recovery.php
+++ b/apps/encryption/lib/recovery.php
@@ -3,7 +3,6 @@
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Clark Tomlinson <fallen013@gmail.com>
  * @author Lukas Reschke <lukas@owncloud.com>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  *
  * @copyright Copyright (c) 2016, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/encryption/tests/lib/MigrationTest.php b/apps/encryption/tests/lib/MigrationTest.php
index f00704e42e87a9518b26731fa574fbf617e3cfc1..6edb8624e70778c47a4e69d5c770b2a42ffee148 100644
--- a/apps/encryption/tests/lib/MigrationTest.php
+++ b/apps/encryption/tests/lib/MigrationTest.php
@@ -4,7 +4,6 @@
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Roeland Jago Douma <rullzer@owncloud.com>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  *
  * @copyright Copyright (c) 2016, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files/lib/activity.php b/apps/files/lib/activity.php
index 8d53074da143b108b4f381604500e92358ae3c41..1cbd6c3b973da45b96d972fe4ed825cf60ce1df3 100644
--- a/apps/files/lib/activity.php
+++ b/apps/files/lib/activity.php
@@ -2,7 +2,6 @@
 /**
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  *
  * @copyright Copyright (c) 2016, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 578a8d82b2fcb0cc3920d48b36a3589343d52154..70f8550f39bcdb8c8ae49d9e58e73247785a0db9 100644
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -12,7 +12,6 @@
  * @author Philipp Kapfer <philipp.kapfer@gmx.at>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <robin@mccorkell.me.uk>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/apps/files_external/lib/personalmount.php b/apps/files_external/lib/personalmount.php
index 4761866fa1a3d898ad06659d0e4fc30837b66e35..c3b71fbef32bf039b1e897afbea1670661a5340a 100644
--- a/apps/files_external/lib/personalmount.php
+++ b/apps/files_external/lib/personalmount.php
@@ -3,7 +3,6 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <robin@mccorkell.me.uk>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  *
  * @copyright Copyright (c) 2016, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/lib/sftp.php b/apps/files_external/lib/sftp.php
index 09d743ff93d79a0af770a69cebab6b414186cc5d..f6b2873cf49a460c6c774e7238c90eb4a74842b7 100644
--- a/apps/files_external/lib/sftp.php
+++ b/apps/files_external/lib/sftp.php
@@ -11,7 +11,6 @@
  * @author Robin McCorkell <robin@mccorkell.me.uk>
  * @author Ross Nicoll <jrn@jrn.me.uk>
  * @author SA <stephen@mthosting.net>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2016, ownCloud, Inc.
diff --git a/apps/files_external/lib/streamwrapper.php b/apps/files_external/lib/streamwrapper.php
index 1f1e52aff7535600b86c01b3e04c207618d3d27a..efb51f32ba459803f620239978c31c88e2fb4778 100644
--- a/apps/files_external/lib/streamwrapper.php
+++ b/apps/files_external/lib/streamwrapper.php
@@ -4,7 +4,6 @@
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/apps/files_external/service/storagesservice.php b/apps/files_external/service/storagesservice.php
index 0a4c00c66ad6862706e1d62a8dcafd80a7f53a27..1762b55a06c4b5717ddebb62ba3359d91c607b38 100644
--- a/apps/files_external/service/storagesservice.php
+++ b/apps/files_external/service/storagesservice.php
@@ -4,7 +4,6 @@
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <robin@mccorkell.me.uk>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2016, ownCloud, Inc.
diff --git a/apps/files_external/service/userglobalstoragesservice.php b/apps/files_external/service/userglobalstoragesservice.php
index 03c831fe97105bc5b227f0aa88ecdfa1397b8bbd..111d45869245b7d98b232e68c422c03fb840270f 100644
--- a/apps/files_external/service/userglobalstoragesservice.php
+++ b/apps/files_external/service/userglobalstoragesservice.php
@@ -2,7 +2,6 @@
 /**
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <robin@mccorkell.me.uk>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  *
  * @copyright Copyright (c) 2016, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_external/tests/amazons3migration.php b/apps/files_external/tests/amazons3migration.php
index 679a880475e3d30432166407253c220a314bca3e..d4ea9e2c261502ab583872c176a65ff372f927fb 100644
--- a/apps/files_external/tests/amazons3migration.php
+++ b/apps/files_external/tests/amazons3migration.php
@@ -4,7 +4,6 @@
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin McCorkell <robin@mccorkell.me.uk>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2016, ownCloud, Inc.
diff --git a/apps/files_external/tests/controller/storagescontrollertest.php b/apps/files_external/tests/controller/storagescontrollertest.php
index 97fe3cf51765a23491ee3cc06a6a631ce7de0fa6..5854cb00fee66889448f662f48195f56058a2ce3 100644
--- a/apps/files_external/tests/controller/storagescontrollertest.php
+++ b/apps/files_external/tests/controller/storagescontrollertest.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * @author Robin McCorkell <robin@mccorkell.me.uk>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2016, ownCloud, Inc.
diff --git a/apps/files_external/tests/service/backendservicetest.php b/apps/files_external/tests/service/backendservicetest.php
index 9b4e728de224b4367caf97c4a6eca44e75a76351..8621c98b9b700c894a2a9e70782d01c78833edac 100644
--- a/apps/files_external/tests/service/backendservicetest.php
+++ b/apps/files_external/tests/service/backendservicetest.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * @author Robin McCorkell <robin@mccorkell.me.uk>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  *
  * @copyright Copyright (c) 2016, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_sharing/lib/controllers/externalsharescontroller.php b/apps/files_sharing/lib/controllers/externalsharescontroller.php
index 6a99bce81d3973ad66f84adda6395741d7c66df5..beefb4d70276c0426a69c3936c5f8c44f03fa2e9 100644
--- a/apps/files_sharing/lib/controllers/externalsharescontroller.php
+++ b/apps/files_sharing/lib/controllers/externalsharescontroller.php
@@ -5,7 +5,6 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Roeland Jago Douma <rullzer@owncloud.com>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  *
  * @copyright Copyright (c) 2016, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_sharing/lib/controllers/sharecontroller.php b/apps/files_sharing/lib/controllers/sharecontroller.php
index ce4a14977669725d49643000d57de2fa7c43a544..84143d85e47e274db35b13a19e718bd89e675841 100644
--- a/apps/files_sharing/lib/controllers/sharecontroller.php
+++ b/apps/files_sharing/lib/controllers/sharecontroller.php
@@ -9,7 +9,6 @@
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <robin@mccorkell.me.uk>
  * @author Roeland Jago Douma <rullzer@owncloud.com>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2016, ownCloud, Inc.
diff --git a/apps/files_sharing/lib/sharedmount.php b/apps/files_sharing/lib/sharedmount.php
index 41194ec58629a56f135f79076dcbc1d2fc8a52d6..1e554cc59482f1a174dced741c35b97402d6d88d 100644
--- a/apps/files_sharing/lib/sharedmount.php
+++ b/apps/files_sharing/lib/sharedmount.php
@@ -5,7 +5,6 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Roeland Jago Douma <rullzer@owncloud.com>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  *
  * @copyright Copyright (c) 2016, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/files_sharing/tests/api/shareestest.php b/apps/files_sharing/tests/api/shareestest.php
index 339957a9053bfe77b46ad8c502031776aa68b757..87d143d08537877b33e4c86c830d767a27691b62 100644
--- a/apps/files_sharing/tests/api/shareestest.php
+++ b/apps/files_sharing/tests/api/shareestest.php
@@ -3,7 +3,6 @@
  * @author Björn Schießle <schiessle@owncloud.com>
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Roeland Jago Douma <rullzer@owncloud.com>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2016, ownCloud, Inc.
diff --git a/apps/files_sharing/tests/share.php b/apps/files_sharing/tests/share.php
index 6b8c685cc1021bf3f98684b9e8e1f8b8d0690dd8..aad698bcdbaa2786f9f5497b31c7e4ab5a313e7f 100644
--- a/apps/files_sharing/tests/share.php
+++ b/apps/files_sharing/tests/share.php
@@ -4,7 +4,6 @@
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php
index f7e54ae74a72b7a7d8370c87e160a8534ed8c8ac..bcd73639d3c5f8719c0a1af7a1dbc939db2bd900 100644
--- a/apps/files_trashbin/lib/trashbin.php
+++ b/apps/files_trashbin/lib/trashbin.php
@@ -12,7 +12,6 @@
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <robin@mccorkell.me.uk>
  * @author Roeland Jago Douma <rullzer@owncloud.com>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Sjors van der Pluijm <sjors@desjors.nl>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Victor Dubiniuk <dubiniuk@owncloud.com>
diff --git a/apps/files_trashbin/tests/trashbin.php b/apps/files_trashbin/tests/trashbin.php
index 7844e95084a32b7a135ab2fc8ba32c89d93f94c5..930f8c2bf3ebb2a13e31e76a0d34074a6c9e64da 100644
--- a/apps/files_trashbin/tests/trashbin.php
+++ b/apps/files_trashbin/tests/trashbin.php
@@ -6,7 +6,6 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Roeland Jago Douma <rullzer@owncloud.com>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/apps/files_versions/lib/storage.php b/apps/files_versions/lib/storage.php
index 98714a7563dd4f0c3503a00befe4d35f6c72c01b..b4111d88e30274e7949dc8eec262744cbdc16123 100644
--- a/apps/files_versions/lib/storage.php
+++ b/apps/files_versions/lib/storage.php
@@ -12,7 +12,6 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <robin@mccorkell.me.uk>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Victor Dubiniuk <dubiniuk@owncloud.com>
  * @author Vincent Petry <pvince81@owncloud.com>
diff --git a/apps/provisioning_api/tests/groupstest.php b/apps/provisioning_api/tests/groupstest.php
index a9c011d18ff6476fb5c5c0ae25a93475274cba64..1262f45cb3c201f2aefa3773b5912c5409171461 100644
--- a/apps/provisioning_api/tests/groupstest.php
+++ b/apps/provisioning_api/tests/groupstest.php
@@ -4,7 +4,6 @@
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Roeland Jago Douma <rullzer@owncloud.com>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Tom Needham <tom@owncloud.com>
  *
  * @copyright Copyright (c) 2016, ownCloud, Inc.
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index 8b83b7d917f491fac429fb6f9287abf44a1dbe44..8409e6ce3d88c5034af139969698f599aee26e01 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -17,7 +17,6 @@
  * @author Ralph Krimmel <rkrimme1@gwdg.de>
  * @author Renaud Fortier <Renaud.Fortier@fsaa.ulaval.ca>
  * @author Robin McCorkell <robin@mccorkell.me.uk>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  *
  * @copyright Copyright (c) 2016, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index b1ed23f95fe64931be195410b84155882b8e8524..fc6df5fc60292ad2ac1c2c286bbf6e93b6afc295 100644
--- a/apps/user_ldap/lib/connection.php
+++ b/apps/user_ldap/lib/connection.php
@@ -8,7 +8,6 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <robin@mccorkell.me.uk>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  *
  * @copyright Copyright (c) 2016, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/apps/user_ldap/lib/proxy.php b/apps/user_ldap/lib/proxy.php
index cb8eb72a040bc92b5d98854a6f51120f7da2c4c9..74e2af45269f79e5db64e7a205d3564e8e97abc6 100644
--- a/apps/user_ldap/lib/proxy.php
+++ b/apps/user_ldap/lib/proxy.php
@@ -7,7 +7,6 @@
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin McCorkell <robin@mccorkell.me.uk>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2016, ownCloud, Inc.
diff --git a/apps/user_ldap/lib/wizard.php b/apps/user_ldap/lib/wizard.php
index 4a12d411ec1917b4ef828410623c1b0f9021fa13..5235011fb969452aa325117a7b6798a77edd341c 100644
--- a/apps/user_ldap/lib/wizard.php
+++ b/apps/user_ldap/lib/wizard.php
@@ -10,7 +10,6 @@
  * @author Nicolas Grekas <nicolas.grekas@gmail.com>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <robin@mccorkell.me.uk>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Victor Dubiniuk <dubiniuk@owncloud.com>
  *
  * @copyright Copyright (c) 2016, ownCloud, Inc.
diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index 9a8d2a13835f56529e88ff5a7cbd65bd136aff95..865b7e61892e1f43fcbdf720bfa55b81cc7f88c8 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -9,7 +9,6 @@
  * @author Renaud Fortier <Renaud.Fortier@fsaa.ulaval.ca>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <robin@mccorkell.me.uk>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Tom Needham <tom@owncloud.com>
  *
diff --git a/build/license.php b/build/license.php
index d7ac4e0a143ac7f68974195e2a5841c74b2cbf7e..9d1fd666b80b706491a5793c690759b586d5bc9a 100644
--- a/build/license.php
+++ b/build/license.php
@@ -195,7 +195,9 @@ With help from many libraries and frameworks including:
 			return !in_array($author, [
 				'',
 				'Not Committed Yet <not.committed.yet>',
-				'Jenkins for ownCloud <owncloud-bot@tmit.eu>']);
+				'Jenkins for ownCloud <owncloud-bot@tmit.eu>',
+				'Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>',
+			]);
 		});
 
 		if ($gitRoot) {
diff --git a/lib/private/api.php b/lib/private/api.php
index 40982f65a0c4194a2155c029d2720578d8fb71df..87f2aa9b11843bc6d72cce9df9c56dbcfafda9f9 100644
--- a/lib/private/api.php
+++ b/lib/private/api.php
@@ -9,7 +9,6 @@
  * @author Michael Gapczynski <GapczynskiM@gmail.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Tom Needham <tom@owncloud.com>
  * @author Vincent Petry <pvince81@owncloud.com>
diff --git a/lib/private/app.php b/lib/private/app.php
index 787029b653b0e55b5e7e05a209c2c12472f1416e..3b8cbba3898afd8d4c0fbb056393945c600e116f 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -23,7 +23,6 @@
  * @author Robin McCorkell <robin@mccorkell.me.uk>
  * @author Roeland Jago Douma <rullzer@owncloud.com>
  * @author Sam Tuke <mail@samtuke.com>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Thomas Tanghus <thomas@tanghus.net>
  * @author Tom Needham <tom@owncloud.com>
diff --git a/lib/private/app/dependencyanalyzer.php b/lib/private/app/dependencyanalyzer.php
index 8c2b6e0a5099b2df96bc61c6a75c013a2032bbbe..0cf4bc7216108a9d55a4a02e4bf8c42a5232f936 100644
--- a/lib/private/app/dependencyanalyzer.php
+++ b/lib/private/app/dependencyanalyzer.php
@@ -4,7 +4,6 @@
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2016, ownCloud, Inc.
diff --git a/lib/private/app/platformrepository.php b/lib/private/app/platformrepository.php
index 540ea16dc27269ac766fe1f93d0f355da81e7bca..7363b2a44b1f3703a3c683c06f826956c99ca8ef 100644
--- a/lib/private/app/platformrepository.php
+++ b/lib/private/app/platformrepository.php
@@ -1,6 +1,5 @@
 <?php
 /**
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2016, ownCloud, Inc.
diff --git a/lib/private/appconfig.php b/lib/private/appconfig.php
index 035495992efa2cff31e5bea9419edd7030966d5d..14c48299a8a5a15e8bbb35e2f93b14bfff8ac697 100644
--- a/lib/private/appconfig.php
+++ b/lib/private/appconfig.php
@@ -8,7 +8,6 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <robin@mccorkell.me.uk>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  *
  * @copyright Copyright (c) 2016, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/appframework/middleware/security/securitymiddleware.php b/lib/private/appframework/middleware/security/securitymiddleware.php
index f1ba98254f0df0735c7d3a3f3f3ff919d5703188..f3bc06217cd2a5d76cfaadae46a584358c410793 100644
--- a/lib/private/appframework/middleware/security/securitymiddleware.php
+++ b/lib/private/appframework/middleware/security/securitymiddleware.php
@@ -3,7 +3,6 @@
  * @author Bernhard Posselt <dev@bernhard-posselt.com>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Thomas Tanghus <thomas@tanghus.net>
  *
diff --git a/lib/private/archive/tar.php b/lib/private/archive/tar.php
index 905d99f116b31d460539c92f7cd1fd1fb6c8cf8e..20e2e05f2384c6e405f205d633c92a7c625438dd 100644
--- a/lib/private/archive/tar.php
+++ b/lib/private/archive/tar.php
@@ -11,7 +11,6 @@
  * @author Remco Brenninkmeijer <requist1@starmail.nl>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <robin@mccorkell.me.uk>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2016, ownCloud, Inc.
diff --git a/lib/private/archive/zip.php b/lib/private/archive/zip.php
index 2c617a8e633592dedd1b9ae2c9313ea740ba608f..8962a8e446e71ee420b11cf31912757051606aad 100644
--- a/lib/private/archive/zip.php
+++ b/lib/private/archive/zip.php
@@ -8,7 +8,6 @@
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2016, ownCloud, Inc.
diff --git a/lib/private/db.php b/lib/private/db.php
index 6535bb70d6dc25717e2629d1b90683b120fb0901..5d61231291986312f4e5dfff045fb9139d2bed07 100644
--- a/lib/private/db.php
+++ b/lib/private/db.php
@@ -6,7 +6,6 @@
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/lib/private/db/mdb2schemamanager.php b/lib/private/db/mdb2schemamanager.php
index eec6d072d3f3573685cb1e8e7109aeda3f06b4c7..bcabb6fe57aee58644766dafb8427a86b9ce5a37 100644
--- a/lib/private/db/mdb2schemamanager.php
+++ b/lib/private/db/mdb2schemamanager.php
@@ -6,7 +6,6 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Roeland Jago Douma <rullzer@owncloud.com>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/lib/private/db/mdb2schemawriter.php b/lib/private/db/mdb2schemawriter.php
index 803e7cda0b4489a9ad95b426f3f21b82197e7c93..7dc3bd223a7b22f053dd88e2736e1668999af32d 100644
--- a/lib/private/db/mdb2schemawriter.php
+++ b/lib/private/db/mdb2schemawriter.php
@@ -3,7 +3,6 @@
  * @author Bart Visscher <bartv@thisnet.nl>
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Morris Jobke <hey@morrisjobke.de>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author tbelau666 <thomas.belau@gmx.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
diff --git a/lib/private/db/migrator.php b/lib/private/db/migrator.php
index 6799867c2ee13ce7eab528b431ff17158217d754..7ca3f981358b3ce6d098abd7b75af0e4dbf339f5 100644
--- a/lib/private/db/migrator.php
+++ b/lib/private/db/migrator.php
@@ -3,7 +3,6 @@
  * @author martin-rueegg <martin.rueegg@metaworx.ch>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author tbelau666 <thomas.belau@gmx.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Victor Dubiniuk <dubiniuk@owncloud.com>
diff --git a/lib/private/defaults.php b/lib/private/defaults.php
index 9f3cdd725a83c8d0b054678b22316fa35f46f735..43e8c8082cc415b189bb7cef71d08d3cefef87e6 100644
--- a/lib/private/defaults.php
+++ b/lib/private/defaults.php
@@ -9,7 +9,6 @@
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <robin@mccorkell.me.uk>
  * @author scolebrook <scolebrook@mac.com>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Volkan Gezer <volkangezer@gmail.com>
  *
diff --git a/lib/private/diagnostics/querylogger.php b/lib/private/diagnostics/querylogger.php
index ca1c9cca987979f44ed4e0686444010c798b979d..66a65b71d0401f4b7d9c5a45144871c9e582936c 100644
--- a/lib/private/diagnostics/querylogger.php
+++ b/lib/private/diagnostics/querylogger.php
@@ -2,7 +2,6 @@
 /**
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  *
  * @copyright Copyright (c) 2016, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/filechunking.php b/lib/private/filechunking.php
index 8c341df4a8beeda717e9b268456d23c7fbbe363a..ece215e734494122c6060c3a4fd2d290888de384 100644
--- a/lib/private/filechunking.php
+++ b/lib/private/filechunking.php
@@ -5,7 +5,6 @@
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Thomas Tanghus <thomas@tanghus.net>
  * @author Vincent Petry <pvince81@owncloud.com>
diff --git a/lib/private/files.php b/lib/private/files.php
index a18bcc76519c6eee9b9e90f1c2196a3f00023464..b0d070637d7afb8e7212889002f95673a5f802d6 100644
--- a/lib/private/files.php
+++ b/lib/private/files.php
@@ -12,7 +12,6 @@
  * @author Nicolai Ehemann <en@enlightened.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <robin@mccorkell.me.uk>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thibaut GRIDEL <tgridel@free.fr>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Victor Dubiniuk <dubiniuk@owncloud.com>
diff --git a/lib/private/files/fileinfo.php b/lib/private/files/fileinfo.php
index 6eeb8529445b2a8fa89150c9d4dc23bfa10c9a65..5f32ad34bb3b1bdce9a8c17c6743a7616dae6e88 100644
--- a/lib/private/files/fileinfo.php
+++ b/lib/private/files/fileinfo.php
@@ -6,7 +6,6 @@
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <robin@mccorkell.me.uk>
  * @author Roeland Jago Douma <rullzer@owncloud.com>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author tbartenstein <tbartenstein@users.noreply.github.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
diff --git a/lib/private/files/filesystem.php b/lib/private/files/filesystem.php
index d548db3004f9d2817427cc66e30ce92deb185bcd..a9138b0d2d7e04f1b0d12db5d6137bd8f381efe5 100644
--- a/lib/private/files/filesystem.php
+++ b/lib/private/files/filesystem.php
@@ -14,7 +14,6 @@
  * @author Robin McCorkell <robin@mccorkell.me.uk>
  * @author Roeland Jago Douma <rullzer@owncloud.com>
  * @author Sam Tuke <mail@samtuke.com>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Stephan Peijnik <speijnik@anexia-it.com>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/lib/private/files/node/root.php b/lib/private/files/node/root.php
index 484439ce5f3a0ece5869b64918b21c740cd5ed7e..0be7ee2c4991ff5aca5945b4392f36f6785969bb 100644
--- a/lib/private/files/node/root.php
+++ b/lib/private/files/node/root.php
@@ -6,7 +6,6 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Roeland Jago Douma <rullzer@owncloud.com>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  *
  * @copyright Copyright (c) 2016, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/files/storage/common.php b/lib/private/files/storage/common.php
index f496f03cb9522509d1336848c8d94bf787f72db8..1d4801e5b97eecc712e398668b11c770d96634a7 100644
--- a/lib/private/files/storage/common.php
+++ b/lib/private/files/storage/common.php
@@ -14,7 +14,6 @@
  * @author Robin McCorkell <robin@mccorkell.me.uk>
  * @author Sam Tuke <mail@samtuke.com>
  * @author scambra <sergio@entrecables.com>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/lib/private/files/storage/dav.php b/lib/private/files/storage/dav.php
index 5e00a03ebb820ad3b03b8cad2a76e18db4459634..495419fa865c03639d23c146b1f152038e8722c7 100644
--- a/lib/private/files/storage/dav.php
+++ b/lib/private/files/storage/dav.php
@@ -10,7 +10,6 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Philipp Kapfer <philipp.kapfer@gmx.at>
  * @author Robin Appelman <icewind@owncloud.com>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/lib/private/files/storage/storagefactory.php b/lib/private/files/storage/storagefactory.php
index 5df91fd1eb410640472b91c4ab0912b55999de15..84362cabeccaaa6cd83a1b923fa15738c0b25b2b 100644
--- a/lib/private/files/storage/storagefactory.php
+++ b/lib/private/files/storage/storagefactory.php
@@ -3,7 +3,6 @@
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
  * @copyright Copyright (c) 2016, ownCloud, Inc.
diff --git a/lib/private/files/stream/dir.php b/lib/private/files/stream/dir.php
index b2f0db23e038d99b10a2032e05c1095f5b549239..7489ee683a29cbd8dafe2237a850c6fe7b09993b 100644
--- a/lib/private/files/stream/dir.php
+++ b/lib/private/files/stream/dir.php
@@ -3,7 +3,6 @@
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  *
  * @copyright Copyright (c) 2016, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/files/stream/encryption.php b/lib/private/files/stream/encryption.php
index 4f5dea0009d391c142074286c1ff13baf293a3f2..772c9769bf7de0b5b2f1cb6a12189ebee8d93fc5 100644
--- a/lib/private/files/stream/encryption.php
+++ b/lib/private/files/stream/encryption.php
@@ -4,7 +4,6 @@
  * @author jknockaert <jasper@knockaert.nl>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Roeland Jago Douma <rullzer@owncloud.com>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/lib/private/files/type/detection.php b/lib/private/files/type/detection.php
index dac51c2a166210e586195dba29786091a15473b7..f106a98064fb69eec95c5498dd174199d85908e8 100644
--- a/lib/private/files/type/detection.php
+++ b/lib/private/files/type/detection.php
@@ -7,7 +7,6 @@
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <robin@mccorkell.me.uk>
  * @author Roeland Jago Douma <rullzer@owncloud.com>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Tanghus <thomas@tanghus.net>
  *
  * @copyright Copyright (c) 2016, ownCloud, Inc.
diff --git a/lib/private/files/utils/scanner.php b/lib/private/files/utils/scanner.php
index bc815f5f6da2714a208453fc7f0172a9eb64d130..065265838997606a689e6c163d77ad1b547b7fc9 100644
--- a/lib/private/files/utils/scanner.php
+++ b/lib/private/files/utils/scanner.php
@@ -4,7 +4,6 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Olivier Paroz <github@oparoz.com>
  * @author Robin Appelman <icewind@owncloud.com>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2016, ownCloud, Inc.
diff --git a/lib/private/group.php b/lib/private/group.php
index 48fbe51007a51754781c2199da4e6bf96428d98a..c37b4f63575494741a415d3b3c1accea2f31d66f 100644
--- a/lib/private/group.php
+++ b/lib/private/group.php
@@ -13,7 +13,6 @@
  * @author Qingping Hou <dave2008713@gmail.com>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <robin@mccorkell.me.uk>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2016, ownCloud, Inc.
diff --git a/lib/private/group/dummy.php b/lib/private/group/dummy.php
index ffbc6527ec3ebaa8a417165474b7523f90ea6355..74a19a90592d65a720333fb1532e4d83fa69b3af 100644
--- a/lib/private/group/dummy.php
+++ b/lib/private/group/dummy.php
@@ -8,7 +8,6 @@
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <robin@mccorkell.me.uk>
  * @author Roeland Jago Douma <rullzer@owncloud.com>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2016, ownCloud, Inc.
diff --git a/lib/private/group/manager.php b/lib/private/group/manager.php
index 755d7adba3df5ceb081f58200d3c64bd4601a697..84e3ac7dbf39b95531ff89503273375dd166d090 100644
--- a/lib/private/group/manager.php
+++ b/lib/private/group/manager.php
@@ -12,7 +12,6 @@
  * @author Robin McCorkell <robin@mccorkell.me.uk>
  * @author Roeland Jago Douma <rullzer@owncloud.com>
  * @author Roman Kreisel <mail@romankreisel.de>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author voxsim <Simon Vocella>
  *
diff --git a/lib/private/image.php b/lib/private/image.php
index 42d0bde4a9ff1136489d4dfaf0d19d2e7f0ef758..a97347df623008017d28db1393d9a4f8f607747f 100644
--- a/lib/private/image.php
+++ b/lib/private/image.php
@@ -15,7 +15,6 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Olivier Paroz <github@oparoz.com>
  * @author Robin Appelman <icewind@owncloud.com>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Thomas Tanghus <thomas@tanghus.net>
  *
diff --git a/lib/private/legacy/l10n.php b/lib/private/legacy/l10n.php
index b9cb21fa1ff736ca518916cc064afad9f28e7d55..3530bb4aad1ad725a814f3f4e3c123a104e1a0a0 100644
--- a/lib/private/legacy/l10n.php
+++ b/lib/private/legacy/l10n.php
@@ -9,7 +9,6 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <robin@mccorkell.me.uk>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Thomas Tanghus <thomas@tanghus.net>
  *
diff --git a/lib/private/memcache/factory.php b/lib/private/memcache/factory.php
index 1dbababa98f713eab92e6130883423a2a7b80886..204ded7d5ab0b0b2d2730abecb79bc736cd25f64 100644
--- a/lib/private/memcache/factory.php
+++ b/lib/private/memcache/factory.php
@@ -6,7 +6,6 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <robin@mccorkell.me.uk>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/lib/private/preview.php b/lib/private/preview.php
index a686b65da0ed5cdc9301e35a95f204a863773930..4fca56dd9848ac897ff79c5bc9c797bc2fc7c7fb 100644
--- a/lib/private/preview.php
+++ b/lib/private/preview.php
@@ -10,7 +10,6 @@
  * @author Olivier Paroz <github@oparoz.com>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Roeland Jago Douma <rullzer@owncloud.com>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Tobias Kaminsky <tobias@kaminsky.me>
  *
diff --git a/lib/private/setup/abstractdatabase.php b/lib/private/setup/abstractdatabase.php
index 2b18fe208d7a36beac87cffbcaa9eac2ba15523b..0c1e5904e088a875f2f33631ee3f3dec76e9c7b4 100644
--- a/lib/private/setup/abstractdatabase.php
+++ b/lib/private/setup/abstractdatabase.php
@@ -2,7 +2,6 @@
 /**
  * @author Bart Visscher <bartv@thisnet.nl>
  * @author Joas Schilling <nickvergessen@owncloud.com>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2016, ownCloud, Inc.
diff --git a/lib/private/setup/mysql.php b/lib/private/setup/mysql.php
index 6b438bc2439360db41bed21ef44fdee8a727d075..de2466676c1dd0a33c512eacef6a81291eee47a7 100644
--- a/lib/private/setup/mysql.php
+++ b/lib/private/setup/mysql.php
@@ -4,7 +4,6 @@
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Michael Göhler <somebody.here@gmx.de>
  * @author Roeland Jago Douma <rullzer@owncloud.com>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  *
  * @copyright Copyright (c) 2016, ownCloud, Inc.
diff --git a/lib/private/share/helper.php b/lib/private/share/helper.php
index 3d8cc174349818c5412e63b1139634cdccb545ff..f9581e48e624833919efc2d3ceadec10f99ea26b 100644
--- a/lib/private/share/helper.php
+++ b/lib/private/share/helper.php
@@ -6,7 +6,6 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <robin@mccorkell.me.uk>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/lib/private/share/mailnotifications.php b/lib/private/share/mailnotifications.php
index 5d24b30cbe2e0054120611f45137ab83e17174f8..a664d4ebf47ab14056d0651f7f267ba9a94d3753 100644
--- a/lib/private/share/mailnotifications.php
+++ b/lib/private/share/mailnotifications.php
@@ -6,7 +6,6 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin McCorkell <robin@mccorkell.me.uk>
  * @author scolebrook <scolebrook@mac.com>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Tom Needham <tom@owncloud.com>
  *
diff --git a/lib/private/share/searchresultsorter.php b/lib/private/share/searchresultsorter.php
index c220699103ae8db584be4c5e76b1f155e9ffb864..6d5542146e7d7a0a86f967b66e136575948d0487 100644
--- a/lib/private/share/searchresultsorter.php
+++ b/lib/private/share/searchresultsorter.php
@@ -3,7 +3,6 @@
  * @author Arthur Schiwon <blizzz@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin McCorkell <robin@mccorkell.me.uk>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  *
  * @copyright Copyright (c) 2016, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index 28fab066c7b063a00c3ba88ab8c59dc4b47fdf5b..3dcfa14079b838ee63d82ae2d910217b90fc818e 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -14,7 +14,6 @@
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <robin@mccorkell.me.uk>
  * @author Roeland Jago Douma <rullzer@owncloud.com>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Sebastian Döll <sebastian.doell@libasys.de>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
diff --git a/lib/private/template.php b/lib/private/template.php
index ad96d21847333fe7299f1ce5e531bbda5d18f3f5..bc706e29344740aafe6cf5c7fcd7b88453f5eaaa 100644
--- a/lib/private/template.php
+++ b/lib/private/template.php
@@ -14,7 +14,6 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Raghu Nayyar <hey@raghunayyar.com>
  * @author Robin Appelman <icewind@owncloud.com>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Vincent Petry <pvince81@owncloud.com>
  *
diff --git a/lib/private/template/base.php b/lib/private/template/base.php
index 5358b18cefa84622309cb710d94d4caf1086ac82..d06bcdc4b827fa2a846525208501d82cab32111f 100644
--- a/lib/private/template/base.php
+++ b/lib/private/template/base.php
@@ -6,7 +6,6 @@
  * @author Jörn Friedrich Dreyer <jfd@butonic.de>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  *
  * @copyright Copyright (c) 2016, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/private/user.php b/lib/private/user.php
index bf64f0941e2bc7c661d462bc050affcc5c2339cd..b91f60e3b9b624072d0adb8ed48b1fb98dc8c0d6 100644
--- a/lib/private/user.php
+++ b/lib/private/user.php
@@ -15,7 +15,6 @@
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <robin@mccorkell.me.uk>
  * @author Roeland Jago Douma <rullzer@owncloud.com>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author shkdee <louis.traynard@m4x.org>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Tom Needham <tom@owncloud.com>
diff --git a/lib/private/util.php b/lib/private/util.php
index 12816ca3303fd5d7a13232cb6c442352ff66c2ad..6884e55c2436748e4c2c6a44b53dabdd27939bb7 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -30,7 +30,6 @@
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <robin@mccorkell.me.uk>
  * @author Roeland Jago Douma <rullzer@owncloud.com>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Stefan Rado <owncloud@sradonia.net>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Thomas Schmidt <tschmidt@suse.de>
diff --git a/lib/public/appframework/controller.php b/lib/public/appframework/controller.php
index c37446833004758269fb824374434d88aa136d29..bd87197a7f14bf05461630c2ea62ea4e338c69b7 100644
--- a/lib/public/appframework/controller.php
+++ b/lib/public/appframework/controller.php
@@ -3,7 +3,6 @@
  * @author Bernhard Posselt <dev@bernhard-posselt.com>
  * @author Lukas Reschke <lukas@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author Thomas Tanghus <thomas@tanghus.net>
  * @author Vincent Petry <pvince81@owncloud.com>
diff --git a/lib/public/appframework/http/redirectresponse.php b/lib/public/appframework/http/redirectresponse.php
index 211d91aff021fbaf9545b33f75345f704ef3148c..97140c9955f6ba7825439eca5c33c12f61eb4d87 100644
--- a/lib/public/appframework/http/redirectresponse.php
+++ b/lib/public/appframework/http/redirectresponse.php
@@ -2,7 +2,6 @@
 /**
  * @author Bernhard Posselt <dev@bernhard-posselt.com>
  * @author Morris Jobke <hey@morrisjobke.de>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  * @author Thomas Müller <thomas.mueller@tmit.eu>
  * @author v1r0x <vinzenz.rosenkranz@gmail.com>
  *
diff --git a/lib/public/appframework/utility/icontrollermethodreflector.php b/lib/public/appframework/utility/icontrollermethodreflector.php
index fb7fbb7c60e8ffb412f7a677d70e3d344db957ec..e2939ff88962cfdca75356caee043f89b5eed053 100644
--- a/lib/public/appframework/utility/icontrollermethodreflector.php
+++ b/lib/public/appframework/utility/icontrollermethodreflector.php
@@ -3,7 +3,6 @@
  * @author Joas Schilling <nickvergessen@owncloud.com>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Olivier Paroz <github@oparoz.com>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  *
  * @copyright Copyright (c) 2016, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/public/backgroundjob.php b/lib/public/backgroundjob.php
index bb0314c570d152c125faea95b492faf4aff10841..69397bb3e4513935ccc4583f846395a3d6dc0255 100644
--- a/lib/public/backgroundjob.php
+++ b/lib/public/backgroundjob.php
@@ -8,7 +8,6 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <robin@mccorkell.me.uk>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  *
  * @copyright Copyright (c) 2016, ownCloud, Inc.
  * @license AGPL-3.0
diff --git a/lib/public/iappconfig.php b/lib/public/iappconfig.php
index a4bcc970188a52c6f582efbf74a57de7de7ecaf3..1406e8a56d6e52cbbb29dd224db2963e1ba39028 100644
--- a/lib/public/iappconfig.php
+++ b/lib/public/iappconfig.php
@@ -4,7 +4,6 @@
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Robin Appelman <icewind@owncloud.com>
  * @author Robin McCorkell <robin@mccorkell.me.uk>
- * @author Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
  *
  * @copyright Copyright (c) 2016, ownCloud, Inc.
  * @license AGPL-3.0