merge 15505 15000
thanks

Thanks for the report.  I'll install a fix momentarily.