merge master into eu
merge master into eu

amzn/amazon-payments-magento-plugin,amzn/amazon-payments-magento-plugin,amzn/amazon-payments-magento-plugin,kirchbergerknorr/amazon-payments-magento-plugin,HirokazuNishi/amazon-payments-magento-plugin,kirchbergerknorr/amazon-payments-magento-plugin,HirokazuNishi/amazon-payments-magento-plugin,kirchbergerknorr/amazon-payments-magento-plugin,HirokazuNishi/amazon-payments-magento-plugin