Merge branch '14345-proppatch'
authorTom Clegg <tclegg@veritasgenetics.com>
Wed, 21 Nov 2018 18:28:00 +0000 (13:28 -0500)
committerTom Clegg <tclegg@veritasgenetics.com>
Wed, 21 Nov 2018 18:28:00 +0000 (13:28 -0500)
refs #14345

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>


Trivial merge