Merge branch 'master' into 13797-refactoring
authorJanicki Artur <artur.janicki@contractors.roche.com>
Thu, 19 Jul 2018 10:10:40 +0000 (12:10 +0200)
committerJanicki Artur <artur.janicki@contractors.roche.com>
Thu, 19 Jul 2018 10:10:40 +0000 (12:10 +0200)
refs #13797

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


Trivial merge