Fantastic admin/admin_user fix
Merge remote-tracking branch 'origin/master'