Merge of FAT32 and Skinny28