svn commits 33077-33081
Merge branch 'master' of github.com:movence/ometa