Applied some patches suggested by Florian Franzen
And VERSION must be updated, too...
Ready for 7.21.01