Adding Nostalgia to make-wmf-branch

Change-Id: I2c56dbacd8628026ee1bbe2d526b9a44453f872e