Ruby 2.0.0 compatibility.
Merge branch 'master' into ruby-2.0