1.0.4
Merge remote-tracking branch 'upstream/master'

Conflicts:
	nispero-abstract/version.sbt