apply J-PKAKE fix to HEAD (original by Ben)
4 files changed