Merge branch 'patch-1' into rails