Avoid duplicated conditionals
Merge pull request #1 from rails/master

Avoid duplicated conditionals