Fixed occasional bad data during initial level state update
Merge remote-tracking branch 'upstream/master' into Tamschi/network-rewrite