Merge branch 'GERONIMO-6683'
authorRomain Manni-Bucau <rmannibucau@gmail.com>
Mon, 21 Jan 2019 07:55:20 +0000 (08:55 +0100)
committerRomain Manni-Bucau <rmannibucau@gmail.com>
Mon, 21 Jan 2019 07:55:20 +0000 (08:55 +0100)

Trivial merge