alexcrichton Merge pull request #1 from nikomatsakis/patch-2 …