Merge pull request #3306 from rubenk/fix-make-check