Merge pull request #2345 from solgenomics/topic/solgs/jessie-fixes