[perl-Log-Dispatch/f20: 2/2] Merge remote-tracking branch 'origin/f21' into f20