7.x-1.5
90a59d39 · Issue #2553705 and #2961210 by billywardrop, pifagor, vinmassaro, alex_optim,... ·