Merge pull request #223 from reactjs/sync-7c90c6eb

Merge pull request #223 from reactjs/sync-7c90c6eb #405