6.x-1.3
30a98c23 · #860540 and #860546 by sreynen ·