r19936: Patch from Kai Blin <kai.blin@gmail.com> to