Applied patch submitted by Ihno Krumreich
33 files changed