Merge pull request #4388 from sartura/netopeer2-dependency