merge recent changes from upstream

We can not use that. This inserts the speach into the svg image.