Merging master into results: required manual conflict resolution.