Remy Maucherat
committed
on 03 Oct 13
Port WS patch.