Merge pull request #1821 from rubenk/memset