One more comment.
Merge branch 'master' into rails4