S-5: Recover rorschach test enumerations
Merge remote-tracking branch 'origin/master'