Merge "Ignore a settings file recreated by P2."