Merge branch 'release-2.140.94' 2.140.94
authorChris Koeritz <fred@gruntose.com>
Sat, 11 Nov 2017 05:56:30 +0000 (00:56 -0500)
committerChris Koeritz <fred@gruntose.com>
Sat, 11 Nov 2017 05:56:30 +0000 (00:56 -0500)
merging in the new release branch


Trivial merge