Various changes agains develop

Here's a rebase of the changes I've collected in my fork.

Feel free to cherry-pick if you don't agree with all changes.

Especially helmo/module-wizard@5d765df8 is a worthwhile fix.