Merge branch 'release-2.140.107' 2.140.107
authorChris Koeritz <fred@gruntose.com>
Wed, 10 Jan 2018 19:56:24 +0000 (14:56 -0500)
committerChris Koeritz <fred@gruntose.com>
Wed, 10 Jan 2018 19:56:24 +0000 (14:56 -0500)
bringing in changes for revamp and other improvements.


Trivial merge