Merge branch 'release-2.140.92' into dev
authorChris Koeritz <fred@gruntose.com>
Fri, 10 Nov 2017 22:18:30 +0000 (17:18 -0500)
committerChris Koeritz <fred@gruntose.com>
Fri, 10 Nov 2017 22:18:30 +0000 (17:18 -0500)
getting latest from release into dev


Trivial merge