Merged in parent commits.