Merge pull request magento#193 from magento-mpi/prs

[Github] Merge public Github commits

Author: vpelipenko

app/code/Magento/Customer/Model/Customer.php

@@ -725,7 +725,7 @@ public function getPrimaryAddresses()
 
         $primaryShipping = $this->getPrimaryShippingAddress();
         if ($primaryShipping) {
-            if ($primaryBilling->getId() == $primaryShipping->getId()) {
+            if ($primaryBilling && $primaryBilling->getId() == $primaryShipping->getId()) {
                 $primaryBilling->setIsPrimaryShipping(true);
             } else {
                 $primaryShipping->setIsPrimaryShipping(true);

app/code/Magento/Tax/Setup/InstallData.php

@@ -69,7 +69,7 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface
                 'visible_in_advanced_search' => true,
                 'used_in_product_listing' => true,
                 'unique' => false,
-                'apply_to' => implode($taxSetup->getTaxableItems(), ',')
+                'apply_to' => implode(',', $taxSetup->getTaxableItems())
             ]
         );