Upstream commit 033d2059caf2733ce6c0916b81e24b3dee54887b, renamed by scripts/upstream-import.py.
486a384