Merge recent changes to the public repository.