Merge from kernelsauce.