IMPORTANT / Fixed issue with incorrect merge
Merge branch '1.6' of ssh://git@github.com/agilebirds/openflexo into 1.6