88d860
Merge Stanislav's changes on top of what I've been doing meanwhile. Conflicts (resolved): avalon-framework.spec