Bug 856848 - Fix thread crash (patch ported to Aurora) r=ehugg a=lsblakk