SVN 408
SVN 409
Merge branch 'svn'
netSelect only on PCAP or socket, not both