Merge branch 'two-away' of stout:src/pytential into two-away