Merge pull request #1942 from akoeplinger/net4x