Merge branch 'ladder'
Dev auth for my offline development needs
Merge branch 'master' into ladder