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)
commitc8cae281264c5be16ef06fb71772589ff2a491b9
tree9118ddd06629697482184cf9ac4e839cad7d3186
parente678509260448b4a892d6a06a03b8d45283d914d
parentfdbcc8ac952b1cf1c84f92cd9b563ef1dd164310
Merge branch 'release-2.140.99'

code changes for release 2.140.99