Merge pull request #1 from gorsuch/master

1.8.7 compatability