Merge branch 'release-2.140.117' into dev
authorChris Koeritz <fred@gruntose.com>
Fri, 22 May 2020 22:25:02 +0000 (18:25 -0400)
committerChris Koeritz <fred@gruntose.com>
Fri, 22 May 2020 22:25:02 +0000 (18:25 -0400)
pulling in latest version update


Trivial merge