Merging in the tassium-auth branch.