Merge branch 'master' into MQE-1609

Author: dobooth

_includes/php-dev/composer-types.md

@@ -6,4 +6,5 @@ The following table discusses the component types that Magento Marketplace suppo
 |Module|magento2-module|Code that modifies Magento application behavior. You can upload a single module to the Magento Marketplace or your module can be dependent on some parent package.|
 |Theme|magento2-theme|Code that modifies the look and feel of the storefront or Magento Admin.|
 |Language package|magento2-language|Translations for the storefront or Admin.|
-
+|Library|magento2-library|Support for libraries located in `lib/internal` instead of in the `vendor` directory.|
+|Component|magento2-component|The package formed of the files that must be located in root (index.php, .htaccess, etc). This includes `dev/tests` and `setup` as well for now.|