Merge branch 'master' into qc-range

Conflicts:
	_oasis
	quickcheck/Arbitrary_OpenFlow0x01.mli
	quickcheck/quickcheck.mllib
	setup.ml