Merge branch 'release-2.140.90' 2.140.90
authorChris Koeritz <fred@gruntose.com>
Fri, 10 Nov 2017 14:49:53 +0000 (09:49 -0500)
committerChris Koeritz <fred@gruntose.com>
Fri, 10 Nov 2017 14:49:53 +0000 (09:49 -0500)
bringing in release to flush intermediate versions of git pull


Trivial merge