Stephen Leaf <smileaf@smileaf.org> Laurent Montel <montel@kde.org> Numerious fixes