Merge pull request #1853 from solgenomics/topic/westcott