nikomatsakis Merge pull request #1 from pwoolcoc/master