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