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