Upgrade ruby to 1.9.3-p484
Auto-merge remote-tracking branch 'upstream/master'