Merge commit '9b6ff229' into 1.1.1+9b6ff229

# Conflicts:
#	build.sbt
#	src/main/scala/firrtl/Visitor.scala
#	src/main/scala/firrtl/annotations/AnnotationUtils.scala
#	src/main/scala/firrtl/passes/ZeroWidth.scala