Thanks, Thomas, for the patch, and Phil for the merge request. I'll take a look at them and will try to get them reviewed/applied upstream as well.
Best wishes, Ryan -- |)|/ Ryan Kavanagh | 4E46 9519 ED67 7734 268F |\|\ https://rak.ac | BD95 8F7B F8FC 4A11 C97A