Merge branch 'release-2.140.91' into dev
authorChris Koeritz <fred@gruntose.com>
Fri, 10 Nov 2017 19:33:43 +0000 (14:33 -0500)
committerChris Koeritz <fred@gruntose.com>
Fri, 10 Nov 2017 19:33:43 +0000 (14:33 -0500)
bringing in latest release


Trivial merge