Commits in git-rails/mainline:master