Merge latest Winshuttle code

Administration