rustup

Please merge into branch rustup_20141105