https://github.com/opencart/opencart/issues/1925
https://github.com/opencart/opencart/issues/1914
dashboard fix
https://github.com/opencart/opencart/issues/1902
Merge remote-tracking branch 'upstream/master'