merge from svn

git-svn-id: http://vcs.taotesting.com/svn/generis/branches/GenerisMinimalApi@4113 ab00eea3-224b-49ca-824e-92964491e928
missing ;

git-svn-id: http://vcs.taotesting.com/svn/generis/branches/GenerisMinimalApi@4114 ab00eea3-224b-49ca-824e-92964491e928
Merge branch 'master' of oat-lionel.github:oat-sa/generis