6.x-1.0-rc1
8967ffd7 · Issue #2410393, #2410409 by gnindl: Backport patches from 7.x version ·