Ruby 2.0.0-p0
Merge branch 'develop'