Merge branch 'crudauth'