Fix is now merged into the development go-ethereum branch: https://github.com/ethereum/go-ethereum/pull/3006#pullreques...
Excellent turnaround time, especially considering that most of the principal developers were asleep in Shanghai when the disruption started.