Merge branch 'master' into 14504-users-admin-panel
authorPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Wed, 5 Dec 2018 10:47:19 +0000 (11:47 +0100)
committerPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Wed, 5 Dec 2018 10:47:19 +0000 (11:47 +0100)
refs #14504

Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>


Trivial merge