rails/rails — pull request #16513 by jonatack (2014-08-15 14:03:33+00:00)
Title: Follow up on #16408

[skip ci]