Merge the current head back into the UCSB repo.