Comment 40 for bug 61182

I've tested and uploaded this patch, but the queue is frozen for builds. If it becomes necessary to roll another with a small batch of fixes, this will be included, otherwise it will be a candidate for a post-release update.