This includes a return to building with threads, since one of the major focuses of the 9.4.x branch is to improve thread performance.