Update for 1.2
Merge pull request #14 from stretchr/1.2

Update for 1.2