Merge pull request #1291 from timlinux/master

Backported fix for #1287 - memchecker not working on osx yosemite