5.2 merge

Need to talk about this one, but figured I should put it out there for people to look in the morning.