Merge branch 'tsqbx' of ssh://gitlab.tiker.net/inducer/pytential into tsqbx