Ruby 2.0 compatibility.
Better regexp for matching Ruby 1.9 version.
Merge branch 'master' into ruby-2.0