Merge pull request #1014 from reactjs/sync-a3e9466d

Merge pull request #1014 from reactjs/sync-a3e9466d #594