Merge pull request #815 from tmds/master