A patch didn't get picked up. Merging it.