Merge branch 'master' into 12197-show-pdh-in-trash
authorTom Clegg <tclegg@veritasgenetics.com>
Mon, 18 Sep 2017 18:24:48 +0000 (14:24 -0400)
committerTom Clegg <tclegg@veritasgenetics.com>
Mon, 18 Sep 2017 18:25:10 +0000 (14:25 -0400)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>


Trivial merge