From: Ben Beltran <redacted>
Date: Mon, 2 Jul 2018 20:54:52 +0000 (-0500)
Subject: Merge branch 'hotfix/3.0.0'
X-Git-Url: https://git.r.bdr.sh/rbdr/r.bdr.sh/commitdiff_plain/52028045a57af345391cadca83891fec19f4c204?hp=7b4e0bf11236cc88a9d7fdf7cc120af2d2ce346b

Merge branch 'hotfix/3.0.0'
---