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