Merge branch 'master' of https://github.com/Kazade/delimit
Fix stuff that breaks on Ubuntu - no idea why