I installed into master the attached patch, which I hopes fixes things. 
Please give it a try. And thanks again for reporting the bug.