Merge branch 'master' into develop

* master:
  add session store error handling
Merge branch 'develop'

* develop: