Merge "Quick fixes for mw.ForeignUpload"