Find attached a proposed patch to fix #1031 Note: The patch is against 3.0, as I wanted to address this before 3.0.2 and unfortunately master was not building for me this evening. Regards, Martin Blix Grydeland