Different users may have same workspace, fixes #114 (lib)
Merge branch 'master' into builds
7.469