Pull to resync with PTB 3.0.11 master.

Pull in David Brainard's changes.