Merge branch 'release-2.140.93' into dev
authorChris Koeritz <fred@gruntose.com>
Sat, 11 Nov 2017 03:50:16 +0000 (22:50 -0500)
committerChris Koeritz <fred@gruntose.com>
Sat, 11 Nov 2017 03:50:16 +0000 (22:50 -0500)
getting release branch stuff into dev


Trivial merge