Reformat user
Make sure pkey is always URL
Better discovery
Don't die on bad RM cookie
Merge branch 'master' into hip2it
Update dependencies
Merge branch 'master' into hip2it