Merge pull request #120 from reactjs/features/render-and-commit

Merge pull request #120 from reactjs/features/render-and-commit #235