Merge pull request #1374 from directhex/master