Merge branch 'release-2.140.99' 2.140.99
authorChris Koeritz <fred@gruntose.com>
Tue, 14 Nov 2017 18:29:30 +0000 (13:29 -0500)
committerChris Koeritz <fred@gruntose.com>
Tue, 14 Nov 2017 18:29:30 +0000 (13:29 -0500)
code changes for release 2.140.99


Trivial merge