(cherry picked from commit 4f1f4a77) # Conflicts: # src/test/scala/chiselTests/Mem.scala # src/test/scala/chiselTests/util/SRAMSpec.scala