Merge branch 'master' into topic/solgwas_speedup
commit580b86c82684f3986c9f39327681d9df230fb22d
authorafpowell <afp43@cornell.edu>
Mon, 11 Feb 2019 17:00:44 +0000 (11 17:00 +0000)
committerafpowell <afp43@cornell.edu>
Mon, 11 Feb 2019 17:00:44 +0000 (11 17:00 +0000)
treeff15fad4bbc416fd272de9c624b0bd985e85a828
parente6bd390da02e5d0107b07f2f4c5a02b93e14f5ce
parentc42f155fca95a8a87a7d6f1d5bbfee1b103e388e
Merge branch 'master' into topic/solgwas_speedup