Merge pull request #3460 from akoeplinger/remove-net_4_5-ifdef