LOW / Fix issue 586
Merge branch '1.6.0' of ssh://git@github.com/agilebirds/openflexo into 1.6.0