Bump rustc version
auto merge of #1039 : alexcrichton/cargo/update-rust, r=alexcrichton
Merge remote-tracking branch 'upstream/master'