Merge pull request #596 from reactjs/sync-ab18d2f0

Merge pull request #596 from reactjs/sync-ab18d2f0 #437