From: Ben Beltran <redacted>
Date: Sat, 21 Apr 2018 08:26:19 +0000 (-0500)
Subject: Merge branch 'hotfix/2.1.0'
X-Git-Tag: 2.1.0
X-Git-Url: https://git.r.bdr.sh/rbdr/serpentity/commitdiff_plain/6bec2091722aa6bbeb84a16828f6b3c4823cb477

Merge branch 'hotfix/2.1.0'
---

0ac5b46bdc5086ded3a93d3a7d68ca5ff77cddeb