Update Workshop to latest master

There have been a whole bunch of things fixed since last Workshop update. Does anybody have any objections to this happening now?