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

Merge pull request #215 from reactjs/sync-38b52cfd #391