Andreas Rheinhardt:
> Patch attached.
> 
> - Andreas
> 

Another patch attached

- Andreas