Merge branch 'release-2.140.114' 2.140.114
authorChris Koeritz <fred@gruntose.com>
Thu, 4 Oct 2018 21:53:18 +0000 (17:53 -0400)
committerChris Koeritz <fred@gruntose.com>
Thu, 4 Oct 2018 21:53:18 +0000 (17:53 -0400)
creating release 2.140.114


Trivial merge