Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> (cherry picked from commit a7023ac366)
a7023ac366