Merge branch 'release-2.140.113' into dev
authorChris Koeritz <fred@gruntose.com>
Sat, 26 May 2018 02:31:53 +0000 (22:31 -0400)
committerChris Koeritz <fred@gruntose.com>
Sat, 26 May 2018 02:31:53 +0000 (22:31 -0400)
bringing in the latest release's updates.


Trivial merge