g2: Update qcopt
Merge branch 'TheMuppets/cm-11.0'