Bug 928421 - Re-add --enable-threadsafe to support bisection; r=Waldo
Automatic merge