Merge branch 'global-qbx' of gitlab.tiker.net:inducer/pytential into global-qbx-v2