Merge branch 'master' into remove-lwt

Conflicts:
	.travis.yml
	_tags
	lib/META
	setup.ml