Applied upstream in http://cgit.freedesktop.org/xorg/xserver/commit/?id=b1dab580bdfb4acfe3feddeda6e760098ec4922a
Applied upstream in http:// cgit.freedeskto p.org/xorg/ xserver/ commit/ ?id=b1dab580bdf b4acfe3feddeda6 e760098ec4922a