Update Master to Hydra 6.2 / Rails 4.1