374ad99
Accidentally fixed the EntryMaker issue before I pulled 374ad99. Should reflect upstream now.