Merge branch 'develop' into bugfix/core-GS-5596
authorJeroen De Meerleer <me@jeroened.be>
Thu, 20 Dec 2018 16:31:35 +0000 (17:31 +0100)
committerJeroen De Meerleer <me@jeroened.be>
Thu, 20 Dec 2018 16:31:35 +0000 (17:31 +0100)

Trivial merge