manual merge of

https://github.com/Proxywars/RustAdmin