Fix a unit test bug.
Merge branch 'master' into feature/master-nose-fix (run by Sean Moe)