I installed the attached patch into master and am closing this bug report.