AUTH
Merge branch 'master' into auth
Non-deprecated and stuffs