See #548.
Expands b0fb8d2d126bc8c6e2745c466eb5429c18615738
by adding the necessary fix at another code point.
Fixes a whitespace issue (tabs -> spaces).
Add Changelog entries.
Needs to be backported to 2.1 after tests and review.
Signed-off-by: Thomas Hochstein <thh@inter.net>