Merge pull request #2011 from stevenwalton/master