Merge branch 'release-2.140.104' 2.140.104
authorChris Koeritz <fred@gruntose.com>
Tue, 21 Nov 2017 06:05:13 +0000 (01:05 -0500)
committerChris Koeritz <fred@gruntose.com>
Tue, 21 Nov 2017 06:05:13 +0000 (01:05 -0500)
doc updates


Trivial merge