Merge branch 'master' of github.com:w3c/banana-rdf
Merge branch 'master' of github.com:w3c/banana-rdf
re-adding broken plantain
Merge remote-tracking branch 'upstream/master'

Conflicts:
	project/build.scala
	project/plugins.sbt
Merge branch 'master' into jasmine

Conflicts:
	project/build.scala
	project/plugins.sbt