Nightly build changes

Thank you very much, Philippe, for all the time and effort you put into
this patch!

> So, there might be issues, Michael will certainly rollback if they are
> too painful. Don't throw too many arrows at me :)

We won't roll back! We'll have you fix stuff :-P. Seriously: there's so
much in this change, I'd rather take the time to fix potential issues
than revert back. Thanks again!

--

Michael