Follow mozilla/rust#13268
Follow mozilla/rust#13165
Merge pull request #13 from Kroisse/follow

Update to the rustc master up to 2014-04-09