From: Chris Koeritz <fred@gruntose.com>
Date: Sat, 26 May 2018 02:31:53 +0000 (-0400)
Subject: Merge branch 'release-2.140.113' into dev
X-Git-Tag: 2.140.114^2~21
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=a7d1e43ebe9b888621f76fd7b4b89117ed9181d9;p=feisty_meow.git

Merge branch 'release-2.140.113' into dev

bringing in the latest release's updates.
---

a7d1e43ebe9b888621f76fd7b4b89117ed9181d9