Merge netem fixes from master