Pulled latest changes from Opencart/opencart master

Pulled latest changes from Opencart/opencart master and resolved conflicts.