Signed-off-by: Annegies van 't Zand <ace.vtzand@gmail.com> (cherry picked from commit a2737c0896)
a2737c0896