reverted to ruby 1.9.3 again
Merge branch 'master' into stable