This brings r6 up to a stable version of master