Merge recent changes.