Changes to the wireshark parsing plugin
Merge branch 'jeroen'