Patches/fixes
    Christoph Rudorff
    David Bitseff
    Magnus Tautra Knutsen
    Marcel Kilgus
    Vladimir Bezhenar
