Merge pull request #987 from reactjs/sync-84f29eb2

Merge pull request #987 from reactjs/sync-84f29eb2 #535