https://github.com/opencart/opencart/issues/1739
Merge branch 'master' of https://github.com/opencart/opencart

Conflicts:
	upload/admin/controller/extension/modification.php