Small ruby & rails bump.
Revert "Small ruby & rails bump."

This reverts commit 428d8d1f3fcd424aa64aef6b840a68cf62d7ae56.
Merge branch 'master' into develop