spot pushed to v8 (master). "fix ftbfs (thanks to Ben Noordhuis)"