Remy Maucherat
committed
on 17 Jan 14
Port WS patch: upgrade behavior tweaks.