Merge remote-tracking branch 'huggingface/master'

# Conflicts:
#	pytorch_transformers/__init__.py

pytorch_transformers/tokenization_transfo_xl.py

@@ -95,6 +95,7 @@ class TransfoXLTokenizer(PreTrainedTokenizer):
             # in a library like ours, at all.
             vocab_dict = torch.load(pretrained_vocab_file)
             for key, value in vocab_dict.items():
+                if key not in self.__dict__:
                     self.__dict__[key] = value
 
         if vocab_file is not None: