Fix a unit test bug.
Merge branch 'master' into feature/iris (run by Vance Baarda)