Merge branch 'master' of https://github.com/mirage/mirage into merge

Conflicts:
	lib/mirage.ml