Auto merge of rust-lang#3229 - martinhath:master, r=alexcrichton

Add fix and test for rust-lang#3224

This commit fixes rust-lang#3224, and adds a test for it.
First time contributor to Cargo here, so I'm sorry if I put stuff the wrong places :)

Version 0.5.0

Version 0.3.0

Version 0.2.0

Version 0.1.0

0.13.0 release

Version 0.12.0

0.11.0 release

0.10.0 release

0.9.0 release