Merged magnusme-refactor-auth to default branch