merged in entity engine, so we could use master again.