Merge branch 'master' into develop
authorPaul Hoffman <phoffman@nygenome.org>
Mon, 5 Mar 2018 23:03:49 +0000 (18:03 -0500)
committerPaul Hoffman <phoffman@nygenome.org>
Mon, 5 Mar 2018 23:03:49 +0000 (18:03 -0500)

Trivial merge