Don’t encode newlines as \l - it happens downstream
Make clustering work for \ as well as : separators
Merge branch 'feature/fixes'