The remainder of the changeset from the last commit...