WIP: libdelimiter #172

Draft
emma wants to merge 7 commits from libdelimiter into trunk

7 Commits