Modified-by: Christian Hesse <mail@eworm.de> (cherry picked from commit c35485454c)
c35485454c
(cherry picked from commit 07fc5c898a)
07fc5c898a