Merge pull request #497 from reactjs/sync-d52b3ec7

Merge pull request #497 from reactjs/sync-d52b3ec7 #294