From: Ben Beltran <redacted>
Date: Mon, 2 Jul 2018 20:55:01 +0000 (-0500)
Subject: Merge branch 'hotfix/3.0.0' into develop
X-Git-Url: https://git.r.bdr.sh/rbdr/r.bdr.sh/commitdiff_plain/70ae85b7dcfbf34419d516132d4fab0e84d99ad2?ds=inline;hp=--cc

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

70ae85b7dcfbf34419d516132d4fab0e84d99ad2