Make it so there are two alternate "acceptible" answers for 2.3.
Merge branch 'master' of https://github.com/csev/tsugi