Fixed for DragonFly#194

Merged

alexcrichton merged 2 commits intorust-lang:masterfrom

mneumann:dragonfly_fixes_2016_squashed

Feb 21, 2016

Commits on Feb 20, 2016

Squashed commit of the following:
mneumann
committed

Commits on Feb 21, 2016

Fix a couple of issues spotted by alexcrichton.
mneumann
committed