@jeffkaufman Sorry - I fixed and tested this as a patch on release-1.6.29.5-beta
I see I made the pull to master, which doesn't make sense.
This might help some people though, if we could do a bugfix release for release-1.6.29.5-beta.. 
What should I do? 
Close this one, and make another pull for master which can automatically apply there?