bugfix for non-escaped semicolons (#294)

- they were sometimes not recognized and escaped correctly
Merge remote-tracking branch 'origin/ribbons' into ribbons