Merge pull request #1 from rails/master

Wikepedia-Github:master