Merge 3.1 update from upstream
Adds /hermes courtesy of Swift