Merge pull request #610 from reactjs/sync-65d297e9

Merge pull request #610 from reactjs/sync-65d297e9 #498