Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/12110' into 12110
# Conflicts: # app/code/Magento/Catalog/Setup/UpgradeSchema.php