Merge pull request #1855 from coreykosak/master