Merge pull request #2968 from willosborne/fix-workspace-auth