This commit should have gone to a new ticket, as kfw-3.2.0-beta1 is
already tagged.