Merge remote-tracking branch 'tixxit/bug/recomplete-race-condition' into milestones/1.0.0-M7.x
Fixed disposition type rendering.
Version bump to M7.10
Merge branch 'milestones/1.0.0-M7.x'

Conflicts:
	version.sbt