From: Ben Beltran <redacted>
Date: Mon, 3 Jun 2019 21:58:18 +0000 (+0200)
Subject: Merge branch 'hotfix/4.2.0' into develop
X-Git-Url: https://git.r.bdr.sh/rbdr/r.bdr.sh/commitdiff_plain/28ba02c3f7ca767fefb63cb50343c2b0ea25b2ce?ds=inline;hp=-c

Merge branch 'hotfix/4.2.0' into develop
---

28ba02c3f7ca767fefb63cb50343c2b0ea25b2ce