Aligning my fork with Nisovin's Master