Merge pull request #809 from dmrlsn/master