Merge branch 'ruby-2.0'