ruby 1.9.3-p547 support
Merge pull request #2856 from hone/master

ruby 1.9.3-p547 support