Issue #815: Add spec runner changes missing in a previous commit
Issue #815: Add spec runner changes missing in a previous commit

lizards-and-pumpkins/catalog,lizards-and-pumpkins/catalog,lizards-and-pumpkins/catalog