Merge pull request #1514 from directhex/master