Merge branch 'master' into 14098-log-view
authorJanicki Artur <artur.janicki@contractors.roche.com>
Fri, 31 Aug 2018 13:52:56 +0000 (15:52 +0200)
committerJanicki Artur <artur.janicki@contractors.roche.com>
Fri, 31 Aug 2018 13:52:56 +0000 (15:52 +0200)
refs #14098

Arvados-DCO-1.1-Signed-off-by: Janicki Artur <artur.janicki@contractors.roche.com>


Trivial merge