MEDIUM / MODULES-110 fix infinite loop
Merge branch '1.7' of ssh://git@github.com/openflexo-team/openflexo-core.git into 1.7