- Merge branch 'tota' into updateRubyGnome2