Bring Nathaniel's recent work onto master.