session change to avoid an error on some systems
Merge branch 'master' of https://github.com/opencart/opencart