Merge pull request #1739 from tokkee/sh/memcheck