Merge latest changes from original repo into fork.