Patch attached. Will apply it tomorrow unless there are objections.

- Andreas