LOW / prevent NPE
LOW / convertion work in progress
Merge branch '1.7' of ssh://git@github.com/openflexo-team/openflexo-core into 1.7