Merge pull request #625 from reactjs/sync-5138e605

Merge pull request #625 from reactjs/sync-5138e605 #593