Correct a unit test failure #30
Merge branch 'vc_upgrade'