LOW: Fixed some issues with some systems
Merge branch '1.6' of ssh://git@github.com/agilebirds/openflexo.git into 1.6