include flint
Merge branch '4' into arb

Conflicts:
	bin/test_travis.sh