Merge pull request #1052 from sethjackson/master