Merge branch '12614-broken-docker' refs #12614
authorPeter Amstutz <pamstutz@veritasgenetics.com>
Mon, 4 Dec 2017 18:47:46 +0000 (13:47 -0500)
committerPeter Amstutz <pamstutz@veritasgenetics.com>
Mon, 4 Dec 2017 18:47:49 +0000 (13:47 -0500)
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>


Trivial merge