I am just submitting the "unstable" merge (change #2874). This does not yet have DEK's latest changes. A great bunch of files are changed. Let's see if it all still works... Thomas