(cherry picked from commit 2f9faa28) # Conflicts: # src/test/scala/chiselTests/simulator/SimulatorSpec.scala