Merges Nan's cleanup commit