xserver 1.20.13

Merged Matt Turner requested to merge mattst88/xserver:xserver-1.20.13 into server-1.20-branch

Signed-off-by: Matt Turner mattst88@gmail.com

Merge request reports