Merge #62852 and #53437 into 5.3 and 5.4

12 years ago by johannes@schlueters.de view source
unread
12 years ago by Anatol Belski view source
unread