Make unit comparison work properly
Merge branch 'master' into packetDump