Michael Albinus writes:
> Looks good to me, thanks a lot! You could apply this to master.

Hi Michael,
Here's a new version of the patch which incorporates your suggestions: