The singularity/narsie are no longer machines
Merge pull request #6333 from tkdrg/singulobj

The singularity/narsie are no longer machines