6.x-2.0
936435b2 · Issue #1184560: Backport of previous commit to D6. ·