Merge branch 'release-2.140.91' 2.140.91
authorChris Koeritz <fred@gruntose.com>
Fri, 10 Nov 2017 19:31:15 +0000 (14:31 -0500)
committerChris Koeritz <fred@gruntose.com>
Fri, 10 Nov 2017 19:31:15 +0000 (14:31 -0500)
getting latest into master


Trivial merge