Merge branch 'release-2.140.88'
authorChris Koeritz <fred@gruntose.com>
Thu, 9 Nov 2017 23:31:20 +0000 (18:31 -0500)
committerChris Koeritz <fred@gruntose.com>
Thu, 9 Nov 2017 23:33:14 +0000 (18:33 -0500)
merging release 2.140.88 off of development branch into master.


Trivial merge