IMPORTANT / CORE-77 Avoid deadlock
Merge branch '1.7.0' of ssh://git@github.com/openflexo-team/openflexo-core into 1.7.0