ruby 1.9.3 fix for multo domain
Merge remote-tracking branch 'upstream/master'