Merge branch 'release-2.140.102' 2.140.102
authorChris Koeritz <fred@gruntose.com>
Sun, 19 Nov 2017 14:14:41 +0000 (09:14 -0500)
committerChris Koeritz <fred@gruntose.com>
Sun, 19 Nov 2017 14:14:41 +0000 (09:14 -0500)
bringing in recent revamp updates


Trivial merge