Thanks for your patch. I pushed it to master as commit
4f0f46e4af0e342d84c5ad448258702029601e4b.