Auto merge of #2384 - jseyfried:master, r=alexcrichton
Auto merge of #2384 - jseyfried:master, r=alexcrichton

r? @alexcrichton

ThinTim/cargo,nipunn1313/cargo,rustyhorde/cargo,rust-lang/cargo,AndiDog/cargo,rust-lang/cargo,brson/cargo,ThinTim/cargo,sbeckeriv/cargo,mark-buer/cargo,achanda/cargo,mark-buer/cargo,AndiDog/cargo,vojtechkral/cargo,eminence/cargo,AndiDog/cargo,tshepang/cargo,eminence/cargo,achanda/cargo,mark-buer/cargo,durka/cargo,vojtechkral/cargo,tsurai/cargo,blaenk/cargo,blaenk/cargo,ThinTim/cargo,rust-lang/cargo,nipunn1313/cargo,mark-buer/cargo,blaenk/cargo,eminence/cargo,achanda/cargo,tshepang/cargo,tsurai/cargo,tsurai/cargo,rust-lang/cargo,blaenk/cargo,sbeckeriv/cargo,rustyhorde/cargo,vojtechkral/cargo,durka/cargo,ThinTim/cargo,brson/cargo,nipunn1313/cargo,brson/cargo,sbeckeriv/cargo,durka/cargo,AndiDog/cargo,rustyhorde/cargo,vojtechkral/cargo,AndiDog/cargo,brson/cargo,rustyhorde/cargo,tsurai/cargo,tshepang/cargo,nipunn1313/cargo,durka/cargo,achanda/cargo,mark-buer/cargo,sbeckeriv/cargo,brson/cargo,blaenk/cargo,ThinTim/cargo,tshepang/cargo,tsurai/cargo,eminence/cargo