Merge in 'creepy'.

This adds a sed patch to fix a whitespace issue. Once the upstream fixes
the issues, the patch will break the program.