Merge "mergeMessageFileList.php: abort on read error"