v3.1
Merge branch 'release'

Conflicts:
	Equiv.v
	imp.mli