Merge of "w/in-commerce/branches/5.2.x@16385" to "w/in-commerce/branches/5.3.x@16392".
Conflicts:
- admin_templates/orders/export/export.tpl
- units/addresses/addresses_config.php
- units/affiliate_payments/affiliate_payments_config.php
- units/affiliates/affiliates_config.php
- units/coupons/coupons_config.php
- units/currencies/currencies_config.php
- units/gateways/gateways_config.php
- units/manufacturers/manufacturers_config.php
- units/order_items/order_items_config.php
- units/orders/orders_config.php
- units/orders/orders_event_handler.php
- units/orders/orders_tag_processor.php
- units/product_option_combinations/product_option_combinations_config.php
- units/products/products_config.php
- units/reports/reports_config.php