Fixed flags for IFF cluster
Merge branch 'master' of https://github.com/juanjosegarciaripoll/mps-bundle

Conflicts:
	scripts/mps_env.sh