Merge pull request #2383 from solgenomics/dauglyon-patch-1