Merge branch 'release-2.140.96' into dev
authorChris Koeritz <fred@gruntose.com>
Sat, 11 Nov 2017 13:29:48 +0000 (08:29 -0500)
committerChris Koeritz <fred@gruntose.com>
Sat, 11 Nov 2017 13:29:48 +0000 (08:29 -0500)
bringing in that crucial fix, finally.  only needed to wake up at 6am on saturday to get it going.


Trivial merge