Merge branch 'master' into 3.0.1

# Conflicts:
#	chiselFrontend/src/main/scala/chisel3/core/BlackBox.scala
#	chiselFrontend/src/main/scala/chisel3/core/Module.scala
#	chiselFrontend/src/main/scala/chisel3/core/UserModule.scala