France has become a more ethnically diverse country since the end of which war?