Merge branch 'release-2.140.92' into dev
authorChris Koeritz <fred@gruntose.com>
Fri, 10 Nov 2017 21:10:06 +0000 (16:10 -0500)
committerChris Koeritz <fred@gruntose.com>
Fri, 10 Nov 2017 21:10:06 +0000 (16:10 -0500)
getting fixes from release branch into dev branch


Trivial merge