Merge branch 'master' into tagbackendtests

# Conflicts:
#	src/test/scala/chiselTests/AsTypeOfTester.scala
#	src/test/scala/chiselTests/Assert.scala
#	src/test/scala/chiselTests/BlackBox.scala
#	src/test/scala/chiselTests/Clock.scala
#	src/test/scala/chiselTests/CompatibilityInteroperabilitySpec.scala
#	src/test/scala/chiselTests/ComplexAssign.scala
#	src/test/scala/chiselTests/Counter.scala
#	src/test/scala/chiselTests/Decoder.scala
#	src/test/scala/chiselTests/ExtModule.scala
#	src/test/scala/chiselTests/Harness.scala
#	src/test/scala/chiselTests/MultiAssign.scala
#	src/test/scala/chiselTests/MultiClockSpec.scala
#	src/test/scala/chiselTests/OneHotMuxSpec.scala
#	src/test/scala/chiselTests/OptionBundle.scala
#	src/test/scala/chiselTests/ParameterizedModule.scala
#	src/test/scala/chiselTests/Printf.scala
#	src/test/scala/chiselTests/Reg.scala
#	src/test/scala/chiselTests/ReinterpretCast.scala
#	src/test/scala/chiselTests/Stop.scala
#	src/test/scala/chiselTests/Tbl.scala
#	src/test/scala/chiselTests/Vec.scala
#	src/test/scala/chiselTests/When.scala