LOW / Prevent NPE
Merge branch '1.7' of ssh://git@github.com/openflexo-team/openflexo-core into 1.7