6.x-3.0
d06086a1 · Issue #1687498 by Nick_vh: Backport 7.x-1.x to 6.x-3.x. ·