6.x-2.0
a86badf7 · Thanks to katbailey for patch on #362919 and cptnCauliflower for patch on #366736 ·