Incorrect logic for <Merge type="all">

This should include a mixture of both submenus and file entries sorted alphabetically. What actually happens is it only includes the file entries.