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

- Andreas