Merge pull request #1473 from longjon/pytest