Merge pull request #148 from reactjs/sync-fc296034

Merge pull request #148 from reactjs/sync-fc296034 #297