Comment 17 for bug 1232419

Thanks Tim, I've done an upload with a fix similar to the one that went upstream to see if that's enough to fix the issue. The other changes would be nice to get and I'm going to review those for the next update