Merge remote-tracking branch 'mainline/2.0' into 2.0-bugfix

Author: Serhiy Shkolyarenko

app/code/Magento/SalesRule/Model/Rule/Condition/Address.php

@@ -61,7 +61,6 @@ public function loadAttributeOptions()
             'base_subtotal' => __('Subtotal'),
             'total_qty' => __('Total Items Quantity'),
             'weight' => __('Total Weight'),
-            'payment_method' => __('Payment Method'),
             'shipping_method' => __('Shipping Method'),
             'postcode' => __('Shipping Postcode'),
             'region' => __('Shipping Region'),