Merge pull request #1944 from akoeplinger/remove-net40-ifdefs