Auto merge of #2215 - JIghtuse:master, r=alexcrichton
Auto merge of #2215 - JIghtuse:master, r=alexcrichton

Fixes #2197

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