Merge pull request #2426 from whitequark/cxxrtl-auto-top