6.x-3.16
c8cd668d · Patches from [#1690990]. Thanks Alex! ·