Merge "Fix mergeMessageFileList.php --extensions-dir extensions:skins"