Merge pull request #2116 from whitequark/cxxrtl-vcd