Merge pull request #578 from reactjs/sync-a1ddcf51

Merge pull request #578 from reactjs/sync-a1ddcf51 #495