Merge branch 'release-2.140.92' 2.140.92
authorChris Koeritz <fred@gruntose.com>
Fri, 10 Nov 2017 22:49:18 +0000 (17:49 -0500)
committerChris Koeritz <fred@gruntose.com>
Fri, 10 Nov 2017 22:49:18 +0000 (17:49 -0500)
bringing in release code for 2.140.92.
this marks a fairly painful learning process for git branches, but it seems like things have stabilized now.


Trivial merge