Automated merge with ssh://repo.gem5.org/gem5