Fix and improve admin-scripts
Merge pull request #1736 from OCamlPro/admin-scripts

Fix and improve admin-scripts