Merge branch 'master' into daft_punk

Conflicts:
	async/Async_NetKAT.ml
	async/Async_NetKAT.mli
	async/discovery.ml
	async/learning.ml