Update to latest

Specifically, this addresses the changes required for
* https://github.com/facebook/react/commit/ec6da04f6a9293ef48cb44c2d3b23dccfd9f271a
* https://github.com/facebook/react/commit/c40e06f7281622a7a6295f4a7d5540a75fedf7bb