Update for non-dev Rust server 20141217