Remy Maucherat
committed
on 09 Oct 13
Port ws logic fixes.