[ issue-1225 ] Back-ported fix to maint-2.4.0
Merge branch 'maint-2.4.0'

Conflicts:
	Agda.cabal