Merge branch 'release-2.140.96' 2.140.96
authorChris Koeritz <fred@gruntose.com>
Sat, 11 Nov 2017 13:30:39 +0000 (08:30 -0500)
committerChris Koeritz <fred@gruntose.com>
Sat, 11 Nov 2017 13:30:39 +0000 (08:30 -0500)
the promised crucial fix


Trivial merge