Wireshark Trunk merge

Changed code in order to be accepted into Wireshark trunk.