Merge pull request #1180 from akoeplinger/no-net40-in-make-check