https://github.com/opencart/opencart/issues/2144
Merge branch 'master' of https://github.com/opencart/opencart
https://github.com/opencart/opencart/issues/2150
Fix PayPal Pro Iframe

Converted brackets to parentheses for config->get
https://github.com/opencart/opencart/issues/2155
Merge pull request #2153 from uksitebuilder/fix-paypal-pro-iframe

Fix PayPal Pro Iframe
Merge pull request #1 from opencart/master

Update