Merge pull request #1868 from shackbarth/react