Adding patch from Toby Thurston for XeLaTeX