Merge branch 'rails'