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

Merge pull request #424 from reactjs/sync-65d297e9 #263