frankmcsherry Merge pull request #251 from benesch/2018ii …