Merge pull request #1 from ruby/trunk

Update