Merge pull request #2547 from solgenomics/topic/modern_mixedmodels2