Fix default session path
Merge branch 'defaultsessionpath' into master-gpc