Merge remote-tracking branch 'mainline/develop' into develop

# Conflicts:
#	app/code/Magento/SampleData/README.md

Author: Yaroslav Onischenko

CHANGELOG.md

@@ -10,7 +10,7 @@
         "lib-libxml": "*"
     },
     "type": "magento2-module",
-    "version": "100.0.1",
+    "version": "100.0.2",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/AdminNotification/composer.json

@@ -13,7 +13,7 @@
         "magento/framework": "100.0.*"
     },
     "type": "magento2-module",
-    "version": "100.0.1",
+    "version": "100.0.2",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/AdvancedPricingImportExport/composer.json

@@ -7,7 +7,7 @@
         "magento/framework": "100.0.*"
     },
     "type": "magento2-module",
-    "version": "100.0.1",
+    "version": "100.0.2",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Authorization/composer.json

@@ -13,7 +13,7 @@
         "magento/framework": "100.0.*"
     },
     "type": "magento2-module",
-    "version": "100.0.1",
+    "version": "100.0.2",
     "license": [
         "proprietary"
     ],

app/code/Magento/Authorizenet/composer.json

@@ -21,7 +21,7 @@
         "magento/framework": "100.0.*"
     },
     "type": "magento2-module",
-    "version": "100.0.1",
+    "version": "100.0.2",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Backend/composer.json

@@ -361,7 +361,7 @@ password,password
 "Shipping Amount","Shipping Amount"
 "Tax Amount","Tax Amount"
 "Browse Files...","Browse Files..."
-"Magento is an eBay Inc. company. Copyright© %1 Magento, Inc. All rights reserved.","Magento is an eBay Inc. company. Copyright© %1 Magento, Inc. All rights reserved."
+"Copyright© %1 Magento Commerce Inc. All rights reserved.","Copyright© %1 Magento Commerce Inc. All rights reserved."
 "Magento ver. %1","Magento ver. %1"
 "Help Us Keep Magento Healthy - Report All Bugs","Help Us Keep Magento Healthy - Report All Bugs"
 "Account Setting","Account Setting"

app/code/Magento/Backend/i18n/en_US.csv

@@ -8,4 +8,4 @@
 
 ?>
 <a class="link-copyright" href="http://magento.com" target="_blank" title="<?php /* @escapeNotVerified */ echo __('Magento') ?>"></a>
-<?php /* @escapeNotVerified */ echo __('Copyright &copy; %1 Magento. All rights reserved.', date('Y')) ?>
+<?php /* @escapeNotVerified */ echo __('Copyright&copy; %1 Magento Commerce Inc. All rights reserved.', date('Y')) ?>

app/code/Magento/Backend/view/adminhtml/templates/page/copyright.phtml

@@ -9,7 +9,7 @@
         "magento/framework": "100.0.*"
     },
     "type": "magento2-module",
-    "version": "100.0.1",
+    "version": "100.0.2",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Backup/composer.json

@@ -22,7 +22,7 @@
         "magento/module-checkout-agreements": "100.0.*"
     },
     "type": "magento2-module",
-    "version": "100.0.1",
+    "version": "100.0.2",
     "license": [
         "proprietary"
     ],