Update whwheeler's fork from the official base