5.x-1.3
97535fc1 · #222666 by drewish: Backport fixes from HEAD. ·