Merge branch 'master' of https://gitlab.tiker.net/inducer/pytential