Merge branch 'react'

Merging cleanup done in preparation for the move to React into master,
it’s not too specific to the move.
Merge branch 'master' into react