Synced with v2.4a of fontspec package