Merge branch 'type_list'
Merge branch 'type_list'
Merge branch 'type_list'
Correct a unit test failure #30
Merge branch 'vc_upgrade'
Merge branch 'master' into type_list