Also update the rest of the CI world whilst we're at it. Change-Id: Iaad2867797cccb2dd0df7758e448b553859fa62c