A try at fixing the broken congestion control
Merge remote-tracking branch 'origin/martijn' into martijn