Forgot to commit this earlier -- needed for the test suite to run.
Authored by: tswift 2014-02-06
Parent: [r7903]
Child: [r7905]
