Merge pull request #198 from reactjs/sync-38b52cfd

Merge pull request #198 from reactjs/sync-38b52cfd #405