Merge Matt Venn pull request