Fix quickhl mappings
Merge branch 'master' into grapefruit