2411: Merge branch '2411-another-pass'
authorWard Vandewege <wvandewege@veritasgenetics.com>
Thu, 24 May 2018 15:30:58 +0000 (11:30 -0400)
committerWard Vandewege <wvandewege@veritasgenetics.com>
Thu, 24 May 2018 15:31:19 +0000 (11:31 -0400)
refs #2411

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <wvandewege@veritasgenetics.com>


Trivial merge