Andreas Rheinhardt:
> Patches attached.
> 
> - Andreas
> 
v2 attached.

- Andreas