Alright, this got merged to master and maint-1.9.5 (commit 745bb08cc685848469c7ac55a2575bbefa674a2f and 0f89bd00a61b398e4a3c6e6a9894a1af0104d87e). We are currently rebundling 6.0.8 to include the fix.
Trac: Status: needs_review to closed Resolution: N/Ato fixed