diff --git a/.phpcs.ecg.xml.dist b/.phpcs.ecg.xml.dist
index d802c387385..607d6a889c1 100644
--- a/.phpcs.ecg.xml.dist
+++ b/.phpcs.ecg.xml.dist
@@ -66,6 +66,7 @@
         <exclude-pattern>*/core/Mage/Catalog/Model/Resource/Product/Compare/Item.php*</exclude-pattern>
         <exclude-pattern>*/core/Mage/Catalog/Model/Resource/Product/Indexer/Price.php*</exclude-pattern>
         <exclude-pattern>*/core/Mage/Catalog/Model/Resource/Product/Option/Value.php*</exclude-pattern>
+        <exclude-pattern>*/core/Mage/Catalog/Model/Resource/Product/Type/Configurable/Attribute.php*</exclude-pattern>
         <exclude-pattern>*/core/Mage/CatalogIndex/Model/Indexer.php*</exclude-pattern>
         <exclude-pattern>*/core/Mage/CatalogInventory/Model/Observer.php*</exclude-pattern>
         <exclude-pattern>*/core/Mage/CatalogInventory/Model/Api2/Stock/Item/Rest.php*</exclude-pattern>
@@ -111,6 +112,7 @@
         <exclude-pattern>*/core/Mage/ImportExport/Model/Import/Entity/Product/Type/Grouped.php*</exclude-pattern>
         <exclude-pattern>*/core/Mage/ImportExport/Model/Import/Proxy/Product/Resource.php*</exclude-pattern>
         <exclude-pattern>*/core/Mage/Index/controllers/Adminhtml/ProcessController.php*</exclude-pattern>
+        <exclude-pattern>*/core/Mage/Index/Model/Observer.php*</exclude-pattern>
         <exclude-pattern>*/core/Mage/Index/Model/Process.php*</exclude-pattern>
         <exclude-pattern>*/core/Mage/Index/Model/Resource/Event.php*</exclude-pattern>
         <exclude-pattern>*/core/Mage/Log/Model/Resource/Log.php*</exclude-pattern>
@@ -148,6 +150,7 @@
         <exclude-pattern>*/core/Mage/Sales/Model/Order/Shipment.php*</exclude-pattern>
         <exclude-pattern>*/core/Mage/SalesRule/Model/Observer.php*</exclude-pattern>
         <exclude-pattern>*/core/Mage/SalesRule/Model/Rule.php*</exclude-pattern>
+        <exclude-pattern>*/core/Mage/SalesRule/Model/Coupon/Massgenerator.php*</exclude-pattern>
         <exclude-pattern>*/core/Mage/Tag/controllers/IndexController.php*</exclude-pattern>
         <exclude-pattern>*/core/Mage/Tag/Model/Api.php*</exclude-pattern>
         <exclude-pattern>*/core/Mage/Tag/Model/Resource/Product/Collection.php*</exclude-pattern>
@@ -163,6 +166,7 @@
         <exclude-pattern>*/lib/Varien/Cache/Backend/Memcached.php*</exclude-pattern>
         <exclude-pattern>*/lib/Varien/Convert/Parser/Csv.php*</exclude-pattern>
         <exclude-pattern>*/lib/Varien/Object/Cache.php*</exclude-pattern>
+        <exclude-pattern>*/shell/indexer.php*</exclude-pattern>
         <exclude-pattern>*/core/Mage/*/data/*</exclude-pattern>
         <exclude-pattern>*/core/Mage/*/sql/*</exclude-pattern>
     </rule>
diff --git a/composer.json b/composer.json
index 7d2fd3da332..078f224d5cf 100644
--- a/composer.json
+++ b/composer.json
@@ -53,7 +53,7 @@
         "n98/n98_layouthelper": "*"
     },
     "minimum-stability": "dev",
-    "prefer-stable" : true,
+    "prefer-stable": true,
     "authors": [
         {
             "name": "Lee Saferite",
@@ -92,16 +92,10 @@
         }
     },
     "extra": {
-        "magento-root-dir": ".",
-        "magento-deploystrategy": "copy",
-        "magento-deploystrategy-dev": "symlink",
-        "magento-deploystrategy-overwrite": {
-            "openmage/dev-copyright": "copy",
-            "openmage/dev-translations": "copy",
-            "openmage/legacy-frontend-themes": "copy"
-        },
-        "magento-force": true,
         "patches": {
+            "magento-ecg/coding-standard": {
+                "PR-72 - Fix LoopSniff": "https://patch-diff.githubusercontent.com/raw/magento-ecg/coding-standard/pull/72.patch"
+            },
             "shardj/zf1-future": {
                 "MAG-1.1.1": "https://raw.githubusercontent.com/OpenMage/composer-patches/74862e7a9fa29dd62c5c02d585d931ce9e3c5815/patches/MAG-1.1.1.patch",
                 "MAG-1.9.3.0": "https://raw.githubusercontent.com/OpenMage/composer-patches/74862e7a9fa29dd62c5c02d585d931ce9e3c5815/patches/MAG-1.9.3.0.patch",
@@ -111,7 +105,16 @@
                 "OM-2047 - Pass delimiter char to preg_quote": "https://raw.githubusercontent.com/OpenMage/composer-patches/74862e7a9fa29dd62c5c02d585d931ce9e3c5815/patches/OM-2047.patch",
                 "OM-2050 - Prevent checking known date codes": "https://raw.githubusercontent.com/OpenMage/composer-patches/74862e7a9fa29dd62c5c02d585d931ce9e3c5815/patches/OM-2050.patch"
             }
-        }
+        },
+        "magento-root-dir": ".",
+        "magento-deploystrategy": "copy",
+        "magento-deploystrategy-dev": "symlink",
+        "magento-deploystrategy-overwrite": {
+            "openmage/dev-copyright": "copy",
+            "openmage/dev-translations": "copy",
+            "openmage/legacy-frontend-themes": "copy"
+        },
+        "magento-force": true
     },
     "config": {
         "allow-plugins": {
diff --git a/composer.lock b/composer.lock
index 11ab5747805..2bf45974b5a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "59d169c9f9fd98541d9af1b1f00dc20b",
+    "content-hash": "e1e458ca3048c0e7e7ac5e2b6041c47f",
     "packages": [
         {
             "name": "colinmollenhour/cache-backend-redis",