Auto merge of #58 - servo:emilio-patch-1, r=glennw …

Rustup

r? @larsbergstrom / anyone

bors-servo committed Jun 16, 2016