Fixed OPENFLEXO-365
Merge branch '1.5' of ssh://git@github.com/agilebirds/openflexo.git into 1.5