entity.getID() was returning the next ID for a new Entity, not the ID
of the entity itself. Oops.
Merge branch 'master' into input