Merge branch 'release-2.140.97' 2.140.97
authorChris Koeritz <fred@gruntose.com>
Sat, 11 Nov 2017 18:10:15 +0000 (13:10 -0500)
committerChris Koeritz <fred@gruntose.com>
Sat, 11 Nov 2017 18:10:15 +0000 (13:10 -0500)
merging in fixes for push repo upstream


Trivial merge