From: Ben Beltran <redacted>
Date: Sat, 21 Apr 2018 08:26:31 +0000 (-0500)
Subject: Merge branch 'hotfix/2.1.0' into develop
X-Git-Tag: 3.0.0^2~8
X-Git-Url: https://git.r.bdr.sh/rbdr/serpentity/commitdiff_plain/724fec20a20bc50dec32cb0f3c461140daf51c05?hp=--cc

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

724fec20a20bc50dec32cb0f3c461140daf51c05