Fix for indexing local_admin and down
Merge branch 'master' into production