From: Chris Koeritz <fred@gruntose.com>
Date: Tue, 20 Feb 2018 15:58:01 +0000 (-0500)
Subject: Merge branch 'release-2.140.109'
X-Git-Tag: 2.140.109
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=37f0be2c1f584d866e274fb847985d7fd2585504;p=feisty_meow.git

Merge branch 'release-2.140.109'

updates from dev branch for new release
---

e768391ab81b189397f0fd19827999365f8b3e33