From: Chris Koeritz <fred@gruntose.com>
Date: Fri, 10 Nov 2017 21:10:06 +0000 (-0500)
Subject: Merge branch 'release-2.140.92' into dev
X-Git-Tag: 2.140.92^2~4^2
X-Git-Url: https://feistymeow.org/gitweb/?p=feisty_meow.git;a=commitdiff_plain;h=54b61896e2d220b282a3ad77148aec5cd9484fcb

Merge branch 'release-2.140.92' into dev

getting fixes from release branch into dev branch
---

54b61896e2d220b282a3ad77148aec5cd9484fcb