From: Jon Trulson <jon@radscan.com>
Date: Thu, 5 Jul 2018 20:18:07 +0000 (-0600)
Subject: Merge branch 'master' into update-with-master
X-Git-Tag: 2.3.0a~151
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=87ad4219da44c5a835dadae074d47c28d49b098e;p=oweals%2Fcde.git

Merge branch 'master' into update-with-master

Resync one last time with master for 2.3 release tomorrow.
---

87ad4219da44c5a835dadae074d47c28d49b098e