Merge pull request #1014 from txdv/master