Bump MRI version
Fix rake test
Tolerate local clock skew
bump version
fix merge